diff options
| author | 2024-02-08 23:04:28 +0000 | |
|---|---|---|
| committer | 2024-02-08 23:04:28 +0000 | |
| commit | c8a73723476ba714efa119f35daf476f314b10c5 (patch) | |
| tree | 706698c9d59732403a65f259c7c43a305a3931bd /libs/hwui/HardwareBitmapUploader.cpp | |
| parent | 6ea2913b5c18edf4da5ae875ea420d81494c4b2e (diff) | |
| parent | 15f09ee4f4d0031e2ce26094a7a15cd0def2a196 (diff) | |
Merge changes from topic "am-00587d717f7046c1bf34e69a55656461" into main
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 1c8c032473 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd05981421 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ba19e70384 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b603fd5a15 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c1e29c866e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 03699a7035 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aba3b136dd -s ours
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions