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

Change-Id: If9d16bc8e82f3591dd00a966948ec39f04b765d1


Trivial merge