Skip to content
Commit 415d8bee authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f6 am: 84a37a09 am: 13b46d35 

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

Change-Id: If3b0e5ec7f8007540ad5cbf93bba09feafbc77ce
parents cda0e44f 13b46d35
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