OSDN Git Service

Merge "Doze: Wake up on touch, fade between states." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Tue, 9 Sep 2014 20:24:03 +0000 (20:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Sep 2014 20:24:04 +0000 (20:24 +0000)

Trivial merge