Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:13:06 +0000 (17:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:13:06 +0000 (17:13 +0000)
commit64c469c34bfc7e3b017284a709c5eaa5638d227e
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent827fe64146e57ffa374ddca8cd05f17e95f60e1c
parent5e61259f2eb76441a40bed73ba90146ca5fd1e9d
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d
am: 5e61259f2e

Change-Id: I3dcc95cc573adc947772e539964210532a3bd11e