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

Change-Id: I71ffb75b8158e205eae7f1c9302c7393f225e102


Trivial merge