tree afebc8e28765ad4f2ed3fbd93c524fc2c5a06c36
parent 618c78c032ce84c02724a1e5a7f439fa788ecf3a
parent 97a51ad44ae3dcf4976076382923ddcae16233ee
author Brian Carlstrom <bdc@google.com> 1401316303 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401316303 +0000

am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"

* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
  Move to dalvik.vm.lib.2 to force default to libart