diff options
| author | 2023-10-10 23:27:33 +0000 | |
|---|---|---|
| committer | 2023-10-10 23:27:33 +0000 | |
| commit | 89135d8c5304a37e2f3ec038143100ed125a6d8b (patch) | |
| tree | 606e49e7e765c182812c5effeb4d74a3dec484e9 /libs/hwui/AutoBackendTextureRelease.cpp | |
| parent | f60018c19e7ee1a8248cf71d2e37fb2dda895622 (diff) | |
| parent | 412e126e3ee9d4b04d4cdfdd054c84b1d831c01f (diff) | |
Merge changes from topic "am-acfa31f7db2b401488d356397b393840" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfa8dea56d -s ours am: 7a32cf40e0 -s ours am: 98011ba05b -s ours am: 097b4ad143 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea0a7f66d5 -s ours am: 8224d4f508 -s ours am: 6756a43e71 -s ours am: 7366759cc8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e2883a02bf -s ours am: d0e9e07342 -s ours am: 3393d16462 -s ours am: 485db9932d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c78a96634f -s ours am: 1ca6d3a230 -s ours am: 2a12fecea2 -s ours am: 1e3434f1ab -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a3a7d9b3d0 -s ours am: 4d0fb6f616 -s ours am: ba219d6265 -s ours am: ac94586845 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9f39899b9 -s ours am: 3c71978db5 -s ours am: f9c1461a72 -s ours am: 01fd80e2ea -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d0e648a5ca -s ours am: 67b3dbff67 -s ours am: 2fc0a27417 -s ours am: 1f253ce1c2 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b9c9afe0f -s ours am: 57a8d83a11 -s ours am: ba0ebb3dce -s ours am: 9bf67b8cbd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb955c5cf4 -s ours am: 29109671c7 -s ours am: 464979e4e8 -s ours am: 11bfdd491b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bcf46f722c -s ours am: 2b0e6df9c1 -s ours am: 09eff7cfcd -s ours am: 69bbbe9c20 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f58e1b64f6 -s ours am: 9c794acff7 -s ours am: ea4625a7bb -s ours am: 55a1a41527 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a73689023 -s ours am: 6f8e5f9d01 -s ours am: 157fbe4ecd -s ours am: 63d4716a5f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2eeb0e369f -s ours am: 39cd5b2361 -s ours am: fa69acbeb0 -s ours am: 263004636d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d5b3d2f138 -s ours am: af4d5e7eab -s ours am: 8a17151a4c -s ours am: eba46e15fe -s ours
Diffstat (limited to 'libs/hwui/AutoBackendTextureRelease.cpp')
0 files changed, 0 insertions, 0 deletions