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:06:09 +0000 (17:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:06:09 +0000 (17:06 +0000)
commit56145b732511f3b60cef41cc9fd523e50416746c
tree4e56ed552381b85d48ca8ddd29ac899bce8be7b0
parentf35b2943fce839af6333dcb308dc8b6ef8d1ee3f
parent9efea4025dc3c7d0ac3b81714fab223463efaf70
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d
am: 9efea4025d

Change-Id: Ied051797fc0515252976bc51aa79b378e002d027