CP: Fix required sample count tests am: f6a815214a am: b738653968 am: a156cab09b
authorNanley Chery <nanley.g.chery@intel.com>
Tue, 13 Sep 2016 19:14:57 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:14:57 +0000 (19:14 +0000)
am: b6caa767b7

Change-Id: I1873c70e56a8ff2459036eff883f2604449aeafa


Trivial merge