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

Change-Id: I71ad0c72c090974ecb14d01caebfc8e30a9997a7


Trivial merge