tree 1665087a191f5aed6dcb4110b8b9bb48ec5854ed
parent 2903d6fa19e90ad4546330431e2a26245dc0d5bc
parent e6411e681018289c58ae6f622c11db7c800de962
author Brian Carlstrom <bdc@google.com> 1383280550 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383280550 -0700

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

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