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

Change-Id: Idb07f56a688f9359ad1e79b7dd56d6c21ff4348c