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

Change-Id: I6bd7765879a05665e975b97ae501fcb1616159dd


Trivial merge