tree fb6127b939efd8dce2bb03e86d37d2cda2d41281
parent dcf90646b0122b09755014832a67b7c44bc2e1ac
parent ed97938caa7a1e7cde1d060ebbe6f6af1279188e
author Brian Carlstrom <bdc@google.com> 1401318808 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401318808 +0000

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

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