tree efe5824fce5dbe9f2f6c5ffd874d429fb6f6454f
parent 8898f2e261d1bb2b389971803a1f4a23639ade9e
parent 7df64f7c0d933e3a5f18e0d15402f62b819ef8f0
author Brian Carlstrom <bdc@google.com> 1401316304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401316304 +0000

am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
  Move to dalvik.vm.lib.2 to force default to libart