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:10:14 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:10:14 +0000 (17:10 +0000)
commitb706a204bfeb770de8bf52caeca6c2307e98c096
tree4e56ed552381b85d48ca8ddd29ac899bce8be7b0
parentb5768ba6fa39be7930643a6ad41c62c244bebd16
parent56145b732511f3b60cef41cc9fd523e50416746c
Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat-cts-dev am: a268fcbaff am: a489f7548d am: 9efea4025d
am: 56145b7325

Change-Id: I0866fabaec6f22c4b0c70e3b900883f06f84af1a