| commit | 2a46170cd62430e01f129b983edc79c6f8566bba | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Sat Sep 20 04:46:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 04:46:16 2014 +0000 |
| tree | 2b3f57af4c8188e00c3f574ecd987343588e3e06 | |
| parent | a43c3ce17888d4fac3f25846598e79f5990ac887 [diff] | |
| parent | fd92288dfe24ee8a2944b2a605416c7abba3b432 [diff] |
am 54d28e51: am 09395677: Merge "Decouple turning screen on from waking up in policy." into lmp-dev * commit '54d28e51275e948d59484e3bd3e3eaea25c012e8': Decouple turning screen on from waking up in policy.