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)
commite97aac0c17623881dafea9e020907dd9f86fe00c
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parentf498a65279507f106963d2d1f71b62a3ae930d30
parent513a21e843cd870677078df3bcc8f46f302a88b9
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d am: 5e61259f2e am: 64c469c34b
am: 513a21e843

Change-Id: Icd9afe865d9106f9af190db3d97dfff5c33c1c90