Skip to content
Commit 55aca3e1 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 

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

Change-Id: Id1e8441d74e837c5d418f8c2290dbbbf1f922616
parents 4fcdb99c 6ff8a0f6
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