DO NOT MERGE Allow old behavior in image format property tests
authorPyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 20:15:27 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 20:15:27 +0000 (20:15 +0000)
am: a25304112b

Change-Id: I94d91c5df6d360a90aa759df9012992868b0a86d


Trivial merge