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:15 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:08:15 +0000 (18:08 +0000)
am: d7ca1b3b99

Change-Id: I2e7d69d7fd53aadfae846e6016d6ccfc3b4f2856


Trivial merge