Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 18:06:15 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:15 +0000 (18:06 +0000)
am: d635a0dd0b

Change-Id: I21d6522e2faf7dbfaa9822cda40fb78a14fbead6


Trivial merge