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:15:45 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:15:45 +0000 (19:15 +0000)
am: 86cd16b155

Change-Id: Ic3d0f870dbd0a70371fb4aabcfec927f54cdaac1


Trivial merge