Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
am: 9bc066caca

Change-Id: I044625b579fdd93857d7ccbdd0847b7d91a3ab6d


Trivial merge