OSDN Git Service

Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 23 Jul 2014 19:17:22 +0000 (19:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 23 Jul 2014 18:31:55 +0000 (18:31 +0000)
commitd39d731473efbc84ec5640d89d0f275c759b3402
tree5fc564797de509716e5ba8754bb70d5bd004a21e
parent564282a3f4645cf50aedd3cc809debe4f77a586b
parent333efe90978beeed36a45df6b45a7d7119140bb4
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev
res/values/strings.xml