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)
commit0ee06597ef1787998a3ade0ac9ecaf12519d2d70
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parentb6caa767b77c226193988cd0afef35f76cb8fadb
parentfbdbbe93d91ab913125fdf255e6860a72e4ccb70
DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours am: c9b0c26d5c  -s ours
am: fbdbbe93d9  -s ours

Change-Id: Ibeb666162d339eac984b4ee40607494de3cf3b92