OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc98ff5 5c39936)
am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into...
authorJohn Spurlock <jspurlock@google.com>
Wed, 23 Jul 2014 19:28:01 +0000 (19:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Jul 2014 19:28:01 +0000 (19:28 +0000)
* commit '5c3993682ab792d7a98792d30181a32e8cb96548':
  Settings: Wire up Display > Lift to wake.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help