tree d41472385ba4866350f0aa8e8f78c0ef6ac1f802
parent b9c28ce9d4f5539e2118822750fa008d5fe77c29
parent 3a9a2089852d18ef7abbb9476fc3455bfec5a880
author Brian Carlstrom <bdc@google.com> 1383280747 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383280747 -0700

am 3a9a2089: am e6411e68: Merge "Set persist.sys.dalvik.vm.lib at system server startup" into klp-dev

* commit '3a9a2089852d18ef7abbb9476fc3455bfec5a880':
  Set persist.sys.dalvik.vm.lib at system server startup