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:13 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:13 +0000 (18:06 +0000)
am: 64c469c34b

Change-Id: Idb07f56a688f9359ad1e79b7dd56d6c21ff4348c


Trivial merge