Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 19:09:58 +0000 (19:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:09:58 +0000 (19:09 +0000)
commit86cd16b15554eaf9ab1b38e5b406804ca52bb36e
treed45289fd9ce56c6b8363d509c9ff36e528a7f5c5
parenta088a0758765368af083525a889e102c9506e9c8
parent81a9b83fb0621c36536decb959078377848d7dbc
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b
am: 81a9b83fb0

Change-Id: I7247f1e986895927c4eee0f870db9091f1f5f493