DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 20:15:16 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:15:16 +0000 (20:15 +0000)
commit582688df21b745673c2136e65bf64142a4b74110
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parent9aa4cb53bc843bee90c9f047b51d3a45f6922d65
parentff1593ad79fbb0878d463f27749860088aba5501
DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours am: c9b0c26d5c  -s ours am: fbdbbe93d9  -s ours am: 0ee06597ef
am: ff1593ad79  -s ours

Change-Id: Ie224b17a7b8c6a866f6b86e964ef38d39ee00741