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

Change-Id: I54cf94669d9d75dd0a94c74a08bfd17d0c9122d5


Trivial merge