diff options
| author | 2023-05-31 20:27:52 +0000 | |
|---|---|---|
| committer | 2023-05-31 20:27:52 +0000 | |
| commit | b236d4d9a2cfb0d5c3e9050c7f1d76bdd2f5f973 (patch) | |
| tree | 0fa4da1ab6cf3f166368745a7bd0cff8b51362a9 /libs/androidfw/ApkParsing.cpp | |
| parent | cb3cef77d44a7dbeacaaf661a59b11f10b7ef931 (diff) | |
| parent | 61c843cd945ea3e71f8296d4da505779d090b0ff (diff) | |
Merge changes from topic "am-5cbdceefcc62468686244e3c418fa866" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb393ff92e -s ours am: 6041ebdd10 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e8c53fc -s ours am: 4f69d4bca5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7503f46d99 -s ours am: 9298453cb8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 83f0b70428 -s ours am: adbd9b0246 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 876a506297 -s ours am: a8c456a1e4 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a4fcff4b06 -s ours am: a35baa2ca2 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 865ac3bc69 -s ours am: e4f87b6fc0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89812a9a40 -s ours am: 058b5d870d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 49dd4d9cff -s ours am: a52e7efdc9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60d4b310c8 -s ours am: e360fc9e86 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cd1658030a -s ours am: 181af61cf9 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a0b878394 -s ours am: b3c2285b23 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 521ee620cd -s ours am: 9f68d56458 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9ce1b74193 -s ours am: 01884e269a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 955ceede40 -s ours am: 2da4d18f79 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d7eba5dfb5 -s ours am: f07e7ded64 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f7ba22204 -s ours am: a998b9552b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a060f6821 -s ours am: 33f4fd1100 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 27c407e219 -s ours am: 85c8cf42ed -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bdac1455a5 -s ours am: af9069958c -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1d56d3e427 -s ours am: 2cad87f39e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1a2ad776c -s ours am: 2a32fc775f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 883cb3f05c -s ours am: 7b5e7a839e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 40906275c3 -s ours am: b6ca0a1e7b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 770a6590f2 -s ours am: 453264248a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e66224619e -s ours am: 77507ffe05 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 39c1debafd -s ours am: 680115baf7 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b9e05b48fa -s ours am: 99a9e22465 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e03de69820 -s ours am: 63d5cf989e -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 914f58f35a -s ours am: d038c8e4fa -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fdf5b94eb7 -s ours am: 36fe347859 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f9747a4f8 -s ours am: ba2f4e944a -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f590909ff4 -s ours am: 8880f8cdb6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa5d3a9c27 -s ours am: 96744713ab -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions