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

Change-Id: I3e791639a39e2f46da37299a79455b55d2bc8965


Trivial merge