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:05:20 +0000 (19:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:05:20 +0000 (19:05 +0000)
commit81a9b83fb0621c36536decb959078377848d7dbc
treeacfe7611b16da9a996f9e9635dc79298058f31ef
parentdbe13dabd0226226d6047a9696af95f5694fe43c
parent30b11fbc7b3e10c23f8daa15588a37d1fcc59fb3
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff
am: 30b11fbc7b

Change-Id: I6bd7765879a05665e975b97ae501fcb1616159dd