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:18 +0000 (17:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:18 +0000 (17:12 +0000)
am: abbf2e05e4

Change-Id: I964cfaf509b8f6253568a1245cd80d4c0488b2cc


Trivial merge