CP: Fix required sample count tests am: f6a815214a am: dd22d24f36 am: 8b3a1c98ee
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)
am: 732baa1049

Change-Id: I6f68333933a781a8e14c7026af4ad39339e361e9


Trivial merge