Revert "DO NOT MERGE Check only valid usages in image format query tests" am: 2a98f95...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:31:45 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:31:45 +0000 (18:31 +0000)
am: 98a0e7017a  -s ours

Change-Id: I83da3cfba139f8992e98ec0a221e52116cbeee30


Trivial merge