Skip to content
Commit 32a5f8b9 authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3 am:... 

Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3 am: c8eebe97 am: c6cc6d35

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1753600

Change-Id: Ia5af9d07414c6044cbdea6e1cc9db793488e62e2
parents e1e44e22 c6cc6d35
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