tree 2e2614e76451f733fe10091e568d438e87c23b79
parent 4ad06ed4c4766517d1c2ceef580ce43d0ea24ca2
parent 650565dd01bd46d69f3896ce8987caa16804c33a
author Android Build Merger (Role) <android-build-merger@google.com> 1464891279 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464891280 +0000

Merge "Fix CpuThrottlingWaiter cat failures am: 76a718e081 am: 12fa2d7f63" into nyc-mr1-dev-plus-aosp