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

Change-Id: If77e612a36d34bea73de0bb8ac7df2078bbdd05d


Trivial merge