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

Change-Id: I28c85a91c915aee441951ffaffcb7b8fe0c57f5e


Trivial merge