Skip to content
Commit c95cc393 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: d87aebca 

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

Change-Id: I540adf12db9d9fe75b90d7f98e6a106c44b15268
parents 57a61d24 d87aebca
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