| commit | 37b95162f3f7fbdbb3b29601f8066c8048e3fa31 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Sat Sep 20 02:59:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 02:59:33 2014 +0000 |
| tree | dc099cd43d5c17153966d239289c0ec93bcef743 | |
| parent | 303aa16876bc63fa5c666a8a4b722950ada1d6c2 [diff] | |
| parent | 4df057c98b99ac2962771a800665399aa72c9d4c [diff] |
am 86fdd3cf: am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev * commit '86fdd3cfebf2e4dee1b5244246604f1eb3eb6c03': Decouple turning screen on from waking up in policy.