Merge changes I212a8bc2,I476b6586 into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 16:43:20 +0000 (16:43 +0000)
commit83683a367f39ab901d0e6419256010d9e4835b2a
treeda0cebb71574b99acf02cafbe0a38d8baa0bf14a
parentf594c550af3b178b57bae463028c4b117c9b9491
parent0825a289c0d3fc796906790e0190e5771843c4e1
Merge changes I212a8bc2,I476b6586 into nougat-cts-dev

* changes:
  DO NOT MERGE Allow old behavior in image format property tests
  CP: Fix required sample count tests