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

Change-Id: I63d609b16d37e109d8b4363a8f160b31f42cc21b


Trivial merge