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

Change-Id: Idf403561e6048604c699fdfc5cbba905334fffa5


Trivial merge