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:03 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:09:03 +0000 (18:09 +0000)
am: cbfa79a0bb

Change-Id: I2cb9b54d17cd8641dd83b5e95244a4dc38ee7f8c


Trivial merge