DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:04:11 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:04:11 +0000 (18:04 +0000)
am: fe55de4ec7  -s ours

Change-Id: I2f952623ab4f4e18c39560be9866076f3ca3d26c


Trivial merge