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

Change-Id: Ic45887a4c0a3e51f001bc49436043007db3a6920


Trivial merge