DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)
am: b7ebfc3c10  -s ours

Change-Id: I4329e4aa6e603a6663e6d34b4f0109f5afe55529


Trivial merge