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