tree 5554141cfcb1ad8079ec1ffd9f35b901e0600631
parent ade9a911d04dbd4bfbd3e80a917ea67a581b4797
parent af3efe8ce7e2eeb7a98552af5cf38d8a9720f018
author Brian Carlstrom <bdc@google.com> 1391171660 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391171660 +0000

am af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit 'af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default