Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:09:21 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:09:21 +0000 (18:09 +0000)
commitf498a65279507f106963d2d1f71b62a3ae930d30
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent35f7dd47817014f653cff2c51de81980a79586c4
parent74c7a464c5534784fb9d124eecfa523f51133623
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
am: 74c7a464c5

Change-Id: Ic45887a4c0a3e51f001bc49436043007db3a6920