Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 20:16:06 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 20:16:06 +0000 (20:16 +0000)
commite4b580ab8d4c82a79155dd2a833d09042744e920
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parentc956f346948654bcba3e2a826b8fb882d579ec30
parenta3e36cb1f19c2721a905a4e8dd10e2dfc8942322
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b am: 81a9b83fb0 am: 86cd16b155
am: a3e36cb1f1

Change-Id: I6025f0d35cc90eecb9108d1ed4c6155c39420447