| commit | 76c234c8dfca8203521b022c15a38e041c294589 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Nov 13 16:50:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 13 16:50:53 2014 +0000 |
| tree | 80f66fe2b8543d27ebf37bb81e2337e1751a2f85 | |
| parent | 316e369c4c053125faf9c78d42855f257cfe48a2 [diff] | |
| parent | d0d23c80dae34a126c8024748554a5d07bf3291c [diff] |
am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev * commit 'd0d23c80dae34a126c8024748554a5d07bf3291c': Fix wrong states when waking up from doze via touch