tree 6fd9c376ed00f2611745dec45fcf8448e336f9dd
parent 101f6aa764e3520f85d807ddd9b5348711d84444
parent 8f312e0c3d6dff30d015d2c85fdaae0a39220fd6
author Brian Carlstrom <bdc@google.com> 1403143685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403143685 +0000

am 8f312e0c: Merge "Switch from core to core-libart"

* commit '8f312e0c3d6dff30d015d2c85fdaae0a39220fd6':
  Switch from core to core-libart