OSDN Git Service

Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
authorTao Bao <tbao@google.com>
Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 28 May 2015 21:48:29 +0000 (21:48 +0000)
commit165102f350e08bd186b25b90dd8a42aad8975890
tree7e5dad6b092322b3c82f3a7c00639901020d552f
parent4573dddcce3f232d2eeb20bfe0e204e15a9416e9
parent90237f7beb55dae79cdcba5271f96be778573737
Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/power/PowerManagerService.java