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:02:17 +0000 (17:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:02:17 +0000 (17:02 +0000)
am: a489f7548d

Change-Id: I4077e41f0db49d3514d60f616d6370023a0ef01b


Trivial merge