Skip to content
Commit 94f1ce55 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Add a toggle on whether or not to prompt the user on long-running FGS"... 

Merge "Add a toggle on whether or not to prompt the user on long-running FGS" into tm-dev am: c772fd95 am: 4e59d928

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



Change-Id: Iedb23382c2434efbf49218f1ba20281f69393b17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ede43af 4e59d928
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