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:15:45 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:15:45 +0000 (19:15 +0000)
commita3e36cb1f19c2721a905a4e8dd10e2dfc8942322
tree31695586bf4208aa8c39b4f932b0821f291ff26f
parent76b1d7941392948505e6b068c76061c341926507
parent86cd16b15554eaf9ab1b38e5b406804ca52bb36e
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: 30b11fbc7b am: 81a9b83fb0
am: 86cd16b155

Change-Id: Ic3d0f870dbd0a70371fb4aabcfec927f54cdaac1