Skip to content
Commit e61bcb7e authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid canceling WaitInfo by trampoline activity" into sc-v2-dev am:... 

Merge "Avoid canceling WaitInfo by trampoline activity" into sc-v2-dev am: d87aebca am: c95cc393

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

Change-Id: I1e9907c8766967ca0afc7309a5ba718ad8942ff6
parents 6188f8f4 c95cc393
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