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)
commitd7ca1b3b999dc2cd02078e7b8bcc61ac6fea15ac
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent757dd66a8295c053357ffacfd368662ee74750ab
parentc0f9f273a920d5608db6fdf9b2de89459e9d218f
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

Change-Id: I3e791639a39e2f46da37299a79455b55d2bc8965