Merge "Merge "CP: Reduce max iter count in alloc_callback_fail.device" into nougat...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:13:08 +0000 (17:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:13:08 +0000 (17:13 +0000)

Trivial merge