diff options
| author | 2023-05-04 16:14:33 +0000 | |
|---|---|---|
| committer | 2023-05-04 16:14:33 +0000 | |
| commit | e1f2854e60176b76bdba773a976a0a2a49686cca (patch) | |
| tree | 9d3f31e5888675fda3690848a3fcca7c5eb059ae /libs/androidfw/ZipFileRO.cpp | |
| parent | bf9648a7765085c9ab98247ea7e9ae4a8ef26146 (diff) | |
| parent | f12c2f16ff59bc41eb9c8242534b5fafa21a193c (diff) | |
Merge changes from topic "am-cfc0ee30d79b4ca58f8b32bba97a3517" into udc-dev
* changes:
[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours am: 8f331aabeb -s ours am: 091e1c3905 -s ours am: b9a82b6cf2 -s ours
[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: 98f823be69 -s ours am: 8a16661750 -s ours
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions