Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98...
authorPyry Haulos <phaulos@google.com>
Wed, 12 Oct 2016 17:39:01 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 17:39:01 +0000 (17:39 +0000)
commit91762df4079e1ea4426160973f741dce4915c4a9
tree346a7b39f0e19b9e092e5fe41969109401e737d8
parent94316bd1dbc6e53c7256f2359bd4b464cf91edcb
parent2e3f075e22212141e16a2b81c8342ee9145454b3
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98a2 am: 3edf5fa179
am: 2e3f075e22

Change-Id: Ieaf267ef663df26179db399cf6bb822116812777