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

Change-Id: I18cc3ec3b8aaad7d2a81908045b78bb99cad34c0


Trivial merge