Revert "DO NOT MERGE Check only valid usages in image format query tests" am: 2a98f95...
authorPyry Haulos <phaulos@google.com>
Tue, 11 Oct 2016 20:43:39 +0000 (20:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 20:43:39 +0000 (20:43 +0000)
am: 113a395a8c  -s ours

Change-Id: I47562c717e71c428588df2789613de69d2bc8bca


Trivial merge