| commit | b3e20232d473f2236b44b549586437cc222510e0 | [log] [tgz] |
|---|---|---|
| author | Geoffrey Pitsch <gpitsch@google.com> | Wed Jul 12 17:14:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 12 17:14:54 2017 +0000 |
| tree | 255de426737b7dc3051b69c6dcd45ef1a2b37ade | |
| parent | 4ee913474969fe9719f46942d8b42bd43b023434 [diff] | |
| parent | 329bab9e1bd2f3fcf3343798d9f61b89141a8dc2 [diff] |
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev am: 00ac782f3e am: 329bab9e1b -s ours Change-Id: I8c12da6716c37f68e253b504e14755ada40a9e2e