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:43:30 +0000 (16:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 13 Sep 2016 16:43:30 +0000 (16:43 +0000)

Trivial merge