diff options
| author | 2022-12-05 20:37:47 +0000 | |
|---|---|---|
| committer | 2022-12-05 20:37:47 +0000 | |
| commit | 77c0bad190c3797526d796859b6ef140809874b0 (patch) | |
| tree | e2b9693a55c2044698a855914c7e5c0525d98891 /libs/androidfw/StringPool.cpp | |
| parent | ea9227930607cdaa512c9ed36308fd2f121f80cd (diff) | |
| parent | eb964f1d34e93851d58d7088c66a906732d44bdf (diff) | |
Merge changes from topic "am-0b23c036d5064a80904345516fd59fe6" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c5d26a301b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31bae2fb8d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 91ee06fe36 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 417a0fbe39 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b7a2770a18 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7d9d07e60 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 54106c26be -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ef9cc4fc7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9f37c3f02a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d07dcaab2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a098f4c69 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a55b90492a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 153ccc8f0d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 45975e375c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 488b21074c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dab164d578 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 12fe5b2ff4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 77517f453a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1a949d81d0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbd7a9aa69 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c7221171cf -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08c0393ee7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e9baa9d67d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac25947d63 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions