Skip to content
Commit 9ad8f025 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "[automerger skipped] Merge "Do not go to dream on power button press... 

Merge "[automerger skipped] Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev am: 20e330dc am: 5e3e0d62 -s ours"
parents e58cde7e d2201ffb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment