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

Change-Id: Ie224b17a7b8c6a866f6b86e964ef38d39ee00741


Trivial merge