CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: 8b3a1c98ee...
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 22 Aug 2017 18:04:01 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:04:01 +0000 (18:04 +0000)
am: c232760bc6

Change-Id: Iab8ddecf49f0f30c5e827c057fc0a2c07082af39


Trivial merge