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

Change-Id: I85486a3c640ab4ed359c71bc531968018595c7fb


Trivial merge