| commit | d39d731473efbc84ec5640d89d0f275c759b3402 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Jul 23 19:17:22 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 23 18:31:55 2014 +0000 |
| tree | 5fc564797de509716e5ba8754bb70d5bd004a21e | |
| parent | 564282a3f4645cf50aedd3cc809debe4f77a586b [diff] | |
| parent | 333efe90978beeed36a45df6b45a7d7119140bb4 [diff] |
Merge "Settings: Wire up Display > Lift to wake." into lmp-dev