| commit | 7d37d0950e0fc3730218ea192157318ecbe2949c | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Jun 16 21:21:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 21:21:57 2017 +0000 |
| tree | 74a550d400d4ce8b45eb9089505fd34d2795fb65 | |
| parent | 4b5de9cdc6e7148070fb3bc95098e7f37405b83a [diff] | |
| parent | 5bf7ed94cfd8a2020e1d403d74dae7ce864d6a32 [diff] |
Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-dev am: 5bf7ed94cf Change-Id: If3fabc05a2e75e4f9876b9d21262c282052ea077