Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00
authorPyry Haulos <phaulos@google.com>
Wed, 12 Oct 2016 17:38:49 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 17:38:49 +0000 (17:38 +0000)
commit94316bd1dbc6e53c7256f2359bd4b464cf91edcb
tree346a7b39f0e19b9e092e5fe41969109401e737d8
parent1319ab298598b90f70d3b7e30626a32e0cc43b01
parent6b6e193ea7fd1758e50be08942e2d136585ba062
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00
am: 6b6e193ea7

Change-Id: Ibc3c97fb94127d21ccd20fc060d06b5c21cb5320