DO NOT MERGE Allow old behavior in image format property tests am: a25304112b am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:28:16 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:28:16 +0000 (18:28 +0000)
am: 7c87437844  -s ours

Change-Id: I76fd7c2ace7ae558018ae83d725c92b17ccdf28e


Trivial merge