tree f5bf82d37ddb8573112152f84a9a661c99ade8e9
parent f6331e3cad22b26ae69399eb509af268ff1b6daa
parent 1a8486507e3feb42078ca2581404700a65110f0a
author Brian Carlstrom <bdc@google.com> 1403143918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403143918 +0000

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

* commit '1a8486507e3feb42078ca2581404700a65110f0a':
  Switch from core to core-libart