OSDN Git Service

am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 23 Jul 2014 19:23:46 +0000 (19:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 19:23:46 +0000 (19:23 +0000)
* commit 'd39d731473efbc84ec5640d89d0f275c759b3402':
  Settings: Wire up Display > Lift to wake.


Trivial merge