tree cbe49c8c123f8be5055697c9bf9e1f11b3bbb927
parent 1e05bc6f77b9e609df598ef0aed20a0ef81848a1
parent 2c8c251e73a94ec934bbd5aefb49f2d1be866cdc
author Matthew Williams <mjwilliams@google.com> 1439247092 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439247092 +0000

am 2c8c251e: am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

* commit '2c8c251e73a94ec934bbd5aefb49f2d1be866cdc':
  DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED