tree 715d547d2502de8d04de0ec12233b3183ce62c99
parent bba876e9ebcaa87fe07196f06bff3e2da8e01626
parent 48d58aad651b1c99c6d6e430142941e76fc06d37
author Matthew Williams <mjwilliams@google.com> 1440670483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440670483 +0000

am 48d58aad: (-s ours) am 77d5b914: Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

* commit '48d58aad651b1c99c6d6e430142941e76fc06d37':