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

Change-Id: I6e04aa746a63e016bc4867c960df92192eea1509


Trivial merge