Merge changes from topic 'am-77ae52a26b474123bdafaa0a5618ec7b' into nyc-mr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:12:39 +0000 (17:12 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:12:39 +0000 (17:12 +0000)
* changes:
  Merge changes I212a8bc2,I476b6586 into nougat-cts-dev am: 83683a367f am: b97e86700f am: 91a977c1d3 am: fad5a803ae am: 9eb945b2c3
  DO NOT MERGE Allow old behavior in image format property tests am: 0825a289c0  -s ours am: 29574ad7e7 am: 48cfb69133 am: 19ac07e772 am: 03b5035568
  CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: 8b3a1c98ee am: 732baa1049 am: 420d8d6542


Trivial merge