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

Change-Id: I3dcc95cc573adc947772e539964210532a3bd11e


Trivial merge