commit | 0e5adc0d78d13f201dfbf810e494f1270c4d8184 | [log] [tgz] |
---|---|---|
author | Romain Guy <romainguy@google.com> | Sat Apr 01 04:32:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 01 04:32:15 2017 +0000 |
tree | 8feca59f5bd8c3d1a4b51a373f15fe0a5fce46c4 | |
parent | 3382e600a6e177366e909fdb66633c3f66d03c24 [diff] | |
parent | 66421a8d81d83651cab74c08ad1976d9410be7cb [diff] |
Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev am: 81b292abdf am: 66421a8d81 Change-Id: Ib4f0f82441553ff8862f6f4d2dc7e6ef61f16e47