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

Change-Id: Icdee15ce17bc2a1e59a87aa7e22c27a6c985794e


Trivial merge