Merge "Wait for uncrypt to finish before rebooting" into mnc-dev

author Tao Bao <tbao@google.com>

Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 28 May 2015 21:48:29 +0000 (21:48 +0000)
author Tao Bao <tbao@google.com>
Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 28 May 2015 21:48:29 +0000 (21:48 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/power/PowerManagerService.java
Simple merge
author	Tao Bao <tbao@google.com>
	Thu, 28 May 2015 21:48:27 +0000 (21:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 28 May 2015 21:48:29 +0000 (21:48 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/PowerManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history