tree 7781a8e1e6d169d23dd3479217117dc70ef6f0c2
parent 6d71e1363063fa12d1b5b28e59f16da0d64c7034
parent 7a9b7da0514004d98beeff49072a3f1d167f6060
author sergeyv <sergeyv@google.com> 1505475970 +0000
committer android-build-merger <android-build-merger@google.com> 1505475970 +0000

Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe432650" into oc-mr1-dev-plus-aosp
am: 7a9b7da051

Change-Id: If0cad94709d037fd47a96870d7b4f56622e9131a