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)
commit7a7e58539360db3396ab2da0be088327fff8c874
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent2eb3891686fefe4ab359df6a98916590ee657ce0
parentd7ca1b3b999dc2cd02078e7b8bcc61ac6fea15ac
Merge "CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am: 69c9f158f3 am: 212df0dd39" into nyc-mr1-dev-plus-aosp am: c0f9f273a9
am: d7ca1b3b99

Change-Id: I2e7d69d7fd53aadfae846e6016d6ccfc3b4f2856