diff options
| author | 2024-12-11 11:02:30 -0800 | |
|---|---|---|
| committer | 2024-12-11 11:02:30 -0800 | |
| commit | ed83f59e59f8198292046d7b13e03f325b11759b (patch) | |
| tree | 7c3e5a71b6d2ff293c370bd3a302e30581cbba17 /libs/androidfw/StringPool.cpp | |
| parent | e8ed475e2c0fd4bb9e08f53ef12ad06d6a8f39df (diff) | |
| parent | 02561d6a5bc3259fb5a8ad81edbec538122e8049 (diff) | |
Merge changes from topic "am-be4739ff5b074395a60f969cd98289b5" into main
* changes:
[automerger skipped] Merge changes from topic "cherrypicker-L93200030008016034:N39700030132979086" into udc-qpr-dev am: 89dd525316 -s ours
[automerger skipped] For the wallet card & icon, only allow the drawable be loaded from bitmap. am: 15c02aa570 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions