DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0 -s...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:05:36 +0000 (18:05 +0000)
commit9b5212c12de54f8c635969ef0ecc2adafa10786a
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent1883384320e3272fbff3a5c8cc104ea62c62c41b
parentb7ebfc3c106c735dd47cec174e34a8609ec6e47f
DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours am: 29574ad7e7 am: abbf2e05e4
am: b7ebfc3c10  -s ours

Change-Id: I4329e4aa6e603a6663e6d34b4f0109f5afe55529