Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:23:02 +0000 (18:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:23:02 +0000 (18:23 +0000)
am: e4b580ab8d

Change-Id: I97c7f65c024edfd127158c08be9a46b39ba47bd2


Trivial merge