OSDN Git Service

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)
commit2daea077674caffd34d2022cd4cd37516d919f8c
tree8099cdc5f0b02d62cd3005823aec94f9ec7bb36a
parentfc98ff5c9f160f6e2c754e548b37f73c0a272b4d
parent5c3993682ab792d7a98792d30181a32e8cb96548
am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev

* commit '5c3993682ab792d7a98792d30181a32e8cb96548':
  Settings: Wire up Display > Lift to wake.