DO NOT MERGE Allow old behavior in image format property tests am: a25304112b am...
authorPyry Haulos <phaulos@google.com>
Thu, 15 Sep 2016 20:28:45 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 20:28:45 +0000 (20:28 +0000)
am: 6ae5082e37  -s ours

Change-Id: I111997719d39267c3161355f157ff42aaa9ef5d1


Trivial merge