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

Change-Id: I6025f0d35cc90eecb9108d1ed4c6155c39420447


Trivial merge