diff options
| author | 2023-08-31 18:45:32 +0000 | |
|---|---|---|
| committer | 2023-08-31 18:45:32 +0000 | |
| commit | 2c9c8b4d3d9c6a175e0b0742e72d74f81949d07d (patch) | |
| tree | e236822a9f7d5d3ca5689616542aee5f312f2792 /libs/androidfw/StringPool.cpp | |
| parent | 0a6fd4703b2c27195be44aae3d728ceb05604506 (diff) | |
| parent | eefe9ff326dd78519b58f820c1a94377f90411ed (diff) | |
Merge changes from topic "am-58dff2fcd6154772939abf557ea150e4" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0b927d3b58 -s ours am: d073eba8be -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a6b00b666 -s ours am: add2b3c0bf -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: aa1ad9917f -s ours am: 56a9a204d6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5ccfc6b3a -s ours am: bfdd8cf276 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 5f862fe869 -s ours am: 5c5e2b6a38 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9dde3dc712 -s ours am: aebabb0fe8 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9758e7ec8e -s ours am: 78af6020fb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad75843748 -s ours am: f4b40f602a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 92023faf11 -s ours am: 086ed77a8a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 90233045ad -s ours am: a783a68190 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 25e12b1e4b -s ours am: 4d5b32dfa3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f961ac7c32 -s ours am: 4d771e62c1 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: d5a13d9605 -s ours am: ede2af5d73 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f26c5391d7 -s ours am: be164ca6f0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7eb52a20c5 -s ours am: 9e2801d877 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efc5992cb6 -s ours am: 7a8292193d -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions