DO NOT MERGE Check only valid usages in image format query tests am: c41d4d8427 am...
authorMika Isojrvi <misojarvi@google.com>
Tue, 22 Aug 2017 18:31:33 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:31:33 +0000 (18:31 +0000)
am: 1143c73d02  -s ours

Change-Id: I41fcee52b94e3ff71932463ced77857ea05937a8


Trivial merge