commit | ec034796ab191303e5e506efca5b050cdf423d4b | [log] [tgz] |
---|---|---|
author | John Spurlock <jspurlock@google.com> | Tue Sep 09 21:56:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 21:56:00 2014 +0000 |
tree | 95dc7be79a492cedacaa256cc6ad241686f3b747 | |
parent | e938707a64840c28232333378b753e7a7080551f [diff] | |
parent | f462d0aebab4cfa89f46f1f8da2cbd2f7a9ced59 [diff] |
am 1d182090: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev * commit '1d1820902aab92865bd8ddebb1ddf55f4998051f': Doze: Wake up on touch, fade between states.