Merge "CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:08:49 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:08:49 +0000 (18:08 +0000)
am: 03bf9d9f5c

Change-Id: I6f1d76ca7327f89bb0bfa117a93b1d3b3e47a717


Trivial merge