tree cd9d3141a84a975eebe70804a3bd20b938134227
parent 7b827d04a5cab7d8c5573181de3eb4ea2d0e173a
parent 0254d57367432069256b623c6852da8b92626e79
author Jean-Baptiste Queru <jbq@google.com> 1345762441 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345762441 -0700

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

* commit '0254d57367432069256b623c6852da8b92626e79':
  Fix multiple defined symbol errors