Merge "CP: Reduce max iter count in alloc_callback_fail.device am: ef5688dda6 am...
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:01 +0000 (18:06 +0000)
commit03bf9d9f5c46891c458f86e45374311db018e5a3
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentd9c27af578013e24a83fe774e493b8cf9eddc940
parent15ebbdb224a6d7068b355a03df373297e7636271
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

Change-Id: I4d445e540ada40e4bfbf58fe20724c905209a826