Merge "Fix out of bounds access in internal format query tests" into nyc-dev
authorMika Isojarvi <misojarvi@google.com>
Thu, 10 Mar 2016 23:30:53 +0000 (23:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 10 Mar 2016 23:30:53 +0000 (23:30 +0000)

Trivial merge