DO NOT MERGE Check only valid usages in image format query tests am: c41d4d8427 am...
authorMika Isojrvi <misojarvi@google.com>
Fri, 7 Oct 2016 18:36:17 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Oct 2016 18:36:17 +0000 (18:36 +0000)
am: c7a8034995  -s ours

Change-Id: I82ed4e21bf192d06ee85f6432b3c9e4f22bc2618


Trivial merge