commit | d0d23c80dae34a126c8024748554a5d07bf3291c | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Thu Nov 13 16:46:54 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 13 16:46:57 2014 +0000 |
tree | 6d1d33a24aae318c7d84b932c32aadaea41b59ad | |
parent | 30bd3bb77b8bd1ac70723bcf7f1017fc40ea89b2 [diff] | |
parent | 68b83a784a0c9f3d2483a8a38b8e1ae047c4914e [diff] |
Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev