| commit | c95cc393045b952be27b446d97ed801a4f6d4486 | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Mon Aug 16 02:32:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 02:32:17 2021 +0000 |
| tree | 7fb6510956ea7a83d42f3633572c9523b5b463f0 | |
| parent | 57a61d242ae1f5662a44fac9bfbc362673dc0bf6 [diff] | |
| parent | d87aebcacd00bd229dbdf2c60b7e0bc2f8a08992 [diff] |
Merge "Avoid canceling WaitInfo by trampoline activity" into sc-v2-dev am: d87aebcacd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546181 Change-Id: I540adf12db9d9fe75b90d7f98e6a106c44b15268