Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:09:53 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:09:53 +0000 (18:09 +0000)
commit5e538acfe6fd2aa9128a3dfe472effc09a8ed161
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parente97aac0c17623881dafea9e020907dd9f86fe00c
parent7c0f9f16e2face6d59da3c4d179eba8f07b01321
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d am: 5e61259f2e" into nyc-mr1-dev-plus-aosp am: d635a0dd0b
am: 7c0f9f16e2

Change-Id: If80281c8ce3e1a2b338c5b014535d8067aea31f5