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:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
commitcbfa79a0bbaf5ea698f8c39dacfc899074791ed8
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parent03bf9d9f5c46891c458f86e45374311db018e5a3
parent9bc066caca9ac85da76034f92fddcb652de63d0a
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
am: 9bc066caca

Change-Id: I044625b579fdd93857d7ccbdd0847b7d91a3ab6d