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)
am: 7c0f9f16e2

Change-Id: If80281c8ce3e1a2b338c5b014535d8067aea31f5


Trivial merge