OSDN Git Service

am cfe99e79: merge in master-release history after reset to 102a072d900d56c54ced61446...
authorThe Android Automerger <android-build@google.com>
Wed, 28 May 2014 18:20:13 +0000 (18:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 May 2014 18:20:13 +0000 (18:20 +0000)
commit104513804e6c9a1d458efc6f1fd6a5778c61fd02
tree09a8c781e89626825911cfa529dc792958f48624
parentc2774f9b7341980c626c52a70e4fdf64d1b426e8
parentcfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95
am cfe99e79: merge in master-release history after reset to 102a072d900d56c54ced6144666d35e373fe84b1

* commit 'cfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
  releax wait timeout on start of dumpstate service