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

Change-Id: Ibe523d2ab9d7a815e785b36a795ecac3e4c2acea


Trivial merge