| commit | e61bcb7ed579157ad7457c1014fc74bd694adb0d | [log] [tgz] |
|---|---|---|
| author | Riddle Hsu <riddlehsu@google.com> | Mon Aug 16 02:42:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 02:42:00 2021 +0000 |
| tree | 2383eb2daf34c73d0125b454fa26eb44d5fc709c | |
| parent | 6188f8f4146ad998d04bc2d1fd63b7844c2036f8 [diff] | |
| parent | c95cc393045b952be27b446d97ed801a4f6d4486 [diff] |
Merge "Avoid canceling WaitInfo by trampoline activity" into sc-v2-dev am: d87aebcacd am: c95cc39304 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15546181 Change-Id: I1e9907c8766967ca0afc7309a5ba718ad8942ff6