Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev...
authorDaniel Xie <dxie@google.com>
Tue, 22 Aug 2017 18:09:03 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:09:03 +0000 (18:09 +0000)
commit35f7dd47817014f653cff2c51de81980a79586c4
tree8bc17e860ab661811a94fecb77156bb2e4fd602a
parent0ef15d7cbaf5d2a7370b2102c93996bfa0eb1a4b
parentcbfa79a0bbaf5ea698f8c39dacfc899074791ed8
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d am: 9efea4025d am: 56145b7325 am: b706a204bf am: 9bc066caca
am: cbfa79a0bb

Change-Id: I2cb9b54d17cd8641dd83b5e95244a4dc38ee7f8c