Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:48:41 +0000 (18:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:48:41 +0000 (18:48 +0000)
am: a268fcbaff

Change-Id: Ic3fe280bfa845811e3331b787c5b3ce0e82d3416


Trivial merge