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

Change-Id: Ibeb666162d339eac984b4ee40607494de3cf3b92


Trivial merge