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

Change-Id: Ied051797fc0515252976bc51aa79b378e002d027


Trivial merge