tree b3844a98994ceb394185e7bea3fe9a0e6d48a86d
parent 5b40a0bd02d270b03fd8ac6d76ad8e2d53db84ea
parent 03c16a309951c713ab4ab75434c9305134d72e14
author Brian Carlstrom <bdc@google.com> 1391186489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391186489 +0000

am 03c16a30: am aae47044: Merge "CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '03c16a309951c713ab4ab75434c9305134d72e14':
  CleanSpec for 49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default