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

Change-Id: I0866fabaec6f22c4b0c70e3b900883f06f84af1a


Trivial merge