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

Change-Id: I81aa3628c7aa651ae00371f5478c1b7f48e7baaf


Trivial merge