Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d...

author Charles He <qiurui@google.com>

Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)
author Charles He <qiurui@google.com>
Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)
diff --cc core/java/android/service/persistentdata/PersistentDataBlockManager.java
Simple merge
diff --cc services/core/java/com/android/server/PersistentDataBlockService.java
Simple merge
author	Charles He <qiurui@google.com>
	Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 29 Dec 2016 10:34:04 +0000 (10:34 +0000)
		1	2
core/java/android/service/persistentdata/PersistentDataBlockManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/PersistentDataBlockService.java	patch \|	diff1 \|	diff2 \|	blob \| history