Skip to content
Commit 13b46d35 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 

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

Change-Id: I493a3d6a6b13a92b289e09f3e8855f600e6462bb
parents 858af30f 84a37a09
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