diff options
| author | 2022-07-01 16:25:49 +0000 | |
|---|---|---|
| committer | 2022-07-01 16:25:49 +0000 | |
| commit | acb233aa62b4da5737d6759adf8f6b7d8e02005c (patch) | |
| tree | 109d7c69ce73d6dae887d18eb312592f2163128a /libs/hwui/HardwareBitmapUploader.cpp | |
| parent | 5534596345d5cac2f93b1e73dc7f80de175c1423 (diff) | |
| parent | f479452a060ef18124e55f98a5517f1d0f9eb8c8 (diff) | |
Merge changes from topic "am-504131d87dd44507890c9af93b4ea00a" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 04d4e06868 -s ours am: 4c2ca156e5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e9b37568b -s ours am: 56489d29af -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ebfbe55064 -s ours am: 1fef6ac69e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37224cfe45 -s ours am: 969076725d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 23fafa51c1 -s ours am: 1b2443c273 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7bba989f64 -s ours am: 6a119f4366 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 5b22bc8912 -s ours am: 9c241f3f60 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3b356296 -s ours am: 123c14609a -s ours
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions