DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 17:01:11 +0000 (17:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:01:11 +0000 (17:01 +0000)
commit48cfb69133085026212c6b9c16ba70e2ddd9e3b2
treea485cfb38a2ed1a703bb9f32ab5fa39965fdb7ad
parent8b3a1c98ee7af27cdd4a8e5a68f2e6a69c35231b
parent29574ad7e713809e05637537b42d0341586f4f04
DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours
am: 29574ad7e7

Change-Id: Ibbc02b9eed0315de346b82ef6d245cc293689e5f