tree 4de4df4cb315500e97047b8e5b401beba58e2fab
parent 1888a3a55a0a62629abf98eb5771ad3f55bb7ea1
parent 00ee83ff1bd827a852065986ed0da7a3ded57a55
author Brian Carlstrom <bdc@google.com> 1403144195 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403144195 +0000

am 00ee83ff: Merge "Switch from core to core-libart"

* commit '00ee83ff1bd827a852065986ed0da7a3ded57a55':
  Switch from core to core-libart