Merge "CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)
am: 15ebbdb224

Change-Id: I4d445e540ada40e4bfbf58fe20724c905209a826


Trivial merge