tree 8eae8fe6f6798777286e196ac8c9ad19fc5018a6
parent ddfc32a279eb575380cc3a601cbd989f0177d3be
parent 3a620bf9c93573a219a430cc58b7afd51377bf57
author Brian Carlstrom <bdc@google.com> 1401319130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401319130 +0000

am 3a620bf9: am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '3a620bf9c93573a219a430cc58b7afd51377bf57':
  Move to dalvik.vm.lib.2 to force default to libart