Merge "Add RecoverySystem.rebootWipeAb() system API." into nyc-mr1-dev

author Tao Bao <tbao@google.com>

Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)

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

Mon, 13 Jun 2016 16:43:46 +0000 (16:43 +0000)
author Tao Bao <tbao@google.com>
Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 13 Jun 2016 16:43:46 +0000 (16:43 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/os/RecoverySystem.java
Simple merge
author	Tao Bao <tbao@google.com>
	Mon, 13 Jun 2016 16:43:44 +0000 (16:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 13 Jun 2016 16:43:46 +0000 (16:43 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/os/RecoverySystem.java	patch \|	diff1 \|	diff2 \|	blob \| history