| commit | 6dd80e7d832fc984b874010b9014ea7ff78581ea | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Sep 15 11:49:50 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 15 11:49:50 2017 +0000 |
| tree | 519cc5a7d1178b75a6d8f85d2a544b12f43f757f | |
| parent | 0ec902f62da06fc9fe1a7f40a43e86d6a95d7ae7 [diff] | |
| parent | 10c6d8b68ed18aad06cec22aa18af63d22023a56 [diff] |
Merge "Merge "Merge "Throw if BitmapFactory.Options.inBitmap is HARDWARE" into oc-mr1-dev am: cebe432650" into oc-mr1-dev-plus-aosp am: 7a9b7da051"