| commit | 82ae33fed76d47f4509449d1664376e693b66b81 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Jun 16 21:27:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 21:27:56 2017 +0000 |
| tree | 644cb33ac44e5c7a692febbc77e766730980ef20 | |
| parent | 1c5b4e3633204344f4f0e206895d503ea1579000 [diff] | |
| parent | 030785bb5c92346e4ee0cf8944eb2ecef5c72b0d [diff] |
Merge "Defend against ICOs with large BMPs embedded DO NOT MERGE" into oc-dev am: 5bf7ed94cf am: 030785bb5c Change-Id: Ib270ccf076a435dba017914a020da61d41300d0c