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

Change-Id: Ieaef8c30c57fb48c10cf37d2de3c11c8d1069707


Trivial merge