Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
commit74c7a464c5534784fb9d124eecfa523f51133623
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentcbfa79a0bbaf5ea698f8c39dacfc899074791ed8
parent4011b13ce39ce3c820464ff0101ae3d32ce3f4aa
Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d am: 9efea4025d am: 56145b7325 am: b706a204bf" into nyc-mr1-dev-plus-aosp
am: 4011b13ce3

Change-Id: I70b53ac99e2ffc36881a0932332e94e8cf390a25