commit | d5dfb723b8a33a74d5e86173ce4e72ad400a6375 | [log] [tgz] |
---|---|---|
author | John Spurlock <jspurlock@google.com> | Tue Sep 09 20:24:03 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 09 20:24:04 2014 +0000 |
tree | 29c9d009f8256acb69615ef86cf327b3e6f73cd5 | |
parent | b2201151f367a432650a5ea2ba7b2b22fccf1f20 [diff] | |
parent | 8b12f22bc1f654d0afe1a5588ed3667428b305c8 [diff] |
Merge "Doze: Wake up on touch, fade between states." into lmp-dev