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

Change-Id: I774e43677b052e2cfbe8e9cf39ded587ed4588ed


Trivial merge