Merge "Merge "Restore saveLayer APIs back into the public API." into pi-dev am: ffe1c...

author Derek Sollenberger <djsollen@google.com>

Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)

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

Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)
author Derek Sollenberger <djsollen@google.com>
Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/removed.txt
Simple merge
diff --cc config/hiddenapi-light-greylist.txt
Simple merge
author	Derek Sollenberger <djsollen@google.com>
	Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 2 Apr 2018 23:19:26 +0000 (23:19 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/removed.txt	patch \|	diff1 \|	diff2 \|	blob \| history
config/hiddenapi-light-greylist.txt	patch \|	diff1 \|	diff2 \|	blob \| history