Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:09:37 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:09:37 +0000 (18:09 +0000)
am: 513a21e843

Change-Id: Icd9afe865d9106f9af190db3d97dfff5c33c1c90


Trivial merge