Merge "Add HardwareBuffer support to Bitmaps"

author Marius Renn <renn@google.com>

Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)

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

Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)
author Marius Renn <renn@google.com>
Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/jni/android/graphics/Bitmap.cpp
Simple merge
author	Marius Renn <renn@google.com>
	Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Oct 2018 23:09:30 +0000 (23:09 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/android/graphics/Bitmap.cpp	patch \|	diff1 \|	diff2 \|	blob \| history