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

Change-Id: I81117c01ec8d6fab49c85eafb5c9576250a08791


Trivial merge