diff options
| author | 2024-12-11 11:34:24 -0800 | |
|---|---|---|
| committer | 2024-12-11 11:34:24 -0800 | |
| commit | 80a253ce16d1958bae7196e20d133ba3ec97a9e3 (patch) | |
| tree | 7dfe2fbd23e9f455dc740ec9d7c6d644ddeaf7c8 /libs/androidfw/StringPool.cpp | |
| parent | ff30dea3a129c19c4260250069c39873b6bc36b2 (diff) | |
| parent | aa70a0a335f4da5d0ffd94aa4f4c57f05e146757 (diff) | |
Merge changes from topic "am-7878a529d2db418b8af6aec64b7d66f2" into main
* changes:
[automerger skipped] Merge changes from topic "cherrypicker-L93200030008016034:N27100030132979068" into sc-v2-dev am: c2d256eb0d -s ours am: 26093ca939 -s ours am: 0ad0c10a54 -s ours am: 2e389bb9ad -s ours am: c39c6c4f0a -s ours am: 8cde80027d -s ours
[automerger skipped] For the wallet card & icon, only allow the drawable be loaded from bitmap. am: 9d2059b056 -s ours am: d5c48f31b3 -s ours am: d38c4d4503 -s ours am: dbbd16a955 -s ours am: b6b8332234 -s ours am: ed4f83b1af -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions