tree 490359cb6a91e1df87c350b3ced83f2ed2c51449
parent 451dbd7c006177edb56fc5036ae8c3c110c5f2fd
parent 32d25fdabfaadc95292b43a29b695d8229333bcf
author Brian Carlstrom <bdc@google.com> 1403144274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403144274 +0000

am 32d25fda: am dab766a7: Merge "Switch from core to core-libart"

* commit '32d25fdabfaadc95292b43a29b695d8229333bcf':
  Switch from core to core-libart