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)
commit0ef15d7cbaf5d2a7370b2102c93996bfa0eb1a4b
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parentde32d5f13d7a4ffe520df2138963303d127d00d4
parent03bf9d9f5c46891c458f86e45374311db018e5a3
Merge "CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am: 69c9f158f3 am: 41d571f045 am: f35b2943fc am: b5768ba6fa" into nyc-mr1-dev-plus-aosp am: 15ebbdb224
am: 03bf9d9f5c

Change-Id: I6f1d76ca7327f89bb0bfa117a93b1d3b3e47a717