tree cd9d3141a84a975eebe70804a3bd20b938134227
parent b07faf8f1a7d4bde3fd8b4f7926ad11b38599970
parent 8876725f05518e8170aedb81ab40dfe638eb656f
author Jean-Baptiste Queru <jbq@google.com> 1345762777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345762777 -0700

am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors"

* commit '8876725f05518e8170aedb81ab40dfe638eb656f':
  Fix multiple defined symbol errors