Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6

author Craig Donner <cdonner@google.com>

Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)

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

Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)
author Craig Donner <cdonner@google.com>
Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Craig Donner <cdonner@google.com>
	Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history