tree 5552437e5b4876f8bb2169c0825536e25b533b29
parent 863676ef7f30080a1b88633c7c75f71f91150dbd
parent ae88437d292f253f2bdea16cbe381e0ae46b15ab
author Matthew Williams <mjwilliams@google.com> 1439247927 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439247927 +0000

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

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