| commit | ec89339a8da0cda2cca73eae5659acf553c52477 | [log] [tgz] |
|---|---|---|
| author | Naomi Musgrave <nmusgrave@google.com> | Thu Aug 03 10:31:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 03 10:31:14 2023 +0000 |
| tree | cda25ec05b1c64d44de7d25675a1144e65ecbef6 | |
| parent | 6aba23f9d4c1e6425343f8b5abe4ff3aabf503f2 [diff] | |
| parent | 91660e8bffb4bef31ba8d40c2b0f6708f7b05865 [diff] |
[automerger skipped] Merge "[MediaProjection] Address deadlock between multiple services" into udc-dev am: 607bd36fba am: 91660e8bff -s ours am skip reason: Merged-In I9c21acf069c66f1ade22c49b095ad5339fe13eca with SHA-1 e871b1f611 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24150805 Change-Id: I18710aa71008faa3bb44500773d48f59ac554701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>