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:08 +0000 (18:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:06:08 +0000 (18:06 +0000)
am: 4011b13ce3

Change-Id: I70b53ac99e2ffc36881a0932332e94e8cf390a25


Trivial merge