tree d43b3a99ec9feff195c9227868c823164eb443a8
parent fb82d6bf7c2fb9921bd2f93fbe49c34cba41f824
parent c0e1e9fb472e8d27d55b8bdce8b48dd617b24f29
author Leon Scroggins III <scroggo@google.com> 1497630576 +0000
committer android-build-merger <android-build-merger@google.com> 1497630576 +0000

Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: a7857dd90c
am: c0e1e9fb47

Change-Id: Ife708718061f8b2ee1cd7968ff90fc54ea6e570e