diff options
| author | 2023-09-25 22:00:59 +0000 | |
|---|---|---|
| committer | 2023-09-25 22:00:59 +0000 | |
| commit | 8bd6d9f93b418096f32c9aa92e11e7e8579dc1fb (patch) | |
| tree | 4d30727e07ff5df200331d1e244bae1f12cb42a6 /libs/androidfw/ObbFile.cpp | |
| parent | c89d13e3736fb3a3c9529a3355c0a916a54a62dc (diff) | |
| parent | e1f53d44d3a8cf56797add9c437bd3593dde5899 (diff) | |
Merge changes from topic "am-44edb64d50f3467493dc6c418b2e5553" into udc-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 537b777eae -s ours am: 28805c7b4b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d162abc666 -s ours am: d619e93f1d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 73351e53ea -s ours am: d6a9669dd5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c775fefae -s ours am: 847002288b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2d935dc825 -s ours am: 523c98c529 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7df679c17 -s ours am: 06744b5e27 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ab4c037bbe -s ours am: 8a539c8693 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39788775d4 -s ours am: 4a8934b62f -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fb3a5d688e -s ours am: 132852b3db -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73c8238c5a -s ours am: cc326d2864 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a0cf158f2 -s ours am: f96f5a0f28 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f1e0b52f0 -s ours am: 1c03bc8c18 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 72a9a8584c -s ours am: 8bdac49b31 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 17968daf0a -s ours am: 12b09c771b -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 61317a9808 -s ours am: 3376c696cf -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 800081d352 -s ours am: c9ab8ce693 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9a6043a265 -s ours am: c46d796e70 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: da558f1a8f -s ours am: 7dbd5e92dd -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 180b8e47ff -s ours am: a22942ebeb -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d8849b34c -s ours am: 29c20a8fc0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a342cdf87b -s ours am: b80800045d -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ca288ea1e -s ours am: 02577f23ca -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions