am cfe99e79: merge in master-release history after reset to 102a072d90

* commit 'cfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
  releax wait timeout on start of dumpstate service
This commit is contained in:
The Android Automerger 2014-05-28 18:20:13 +00:00 committed by Android Git Automerger
commit 104513804e

Diff Content Not Available