Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:09:21 +0000 (17:09 +0000)
commit5e61259f2eb76441a40bed73ba90146ca5fd1e9d
treed33716ab9f8c26d00059a73c6cb50eae12e1b803
parent212df0dd397d9dce597e1e2d2db35f4feb4d6036
parenta489f7548dcd2c8b41dd970745ae2f2e3f6828bc
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff
am: a489f7548d

Change-Id: I71ffb75b8158e205eae7f1c9302c7393f225e102