diff options
| author | 2022-08-10 00:41:17 +0000 | |
|---|---|---|
| committer | 2022-08-10 00:41:17 +0000 | |
| commit | e9d9e8a79dd8ec21365555f166b94f940014f82e (patch) | |
| tree | e884acd3acce9b1447bccddcfdec4b30745ce3dd /libs/androidfw/Util.cpp | |
| parent | 3e2c0d1bf13fa22420f4e03afa37bc412c655e84 (diff) | |
| parent | 9896472f73c0eff1334d2b63280bea56f1f367ae (diff) | |
Merge changes from topic "am-7692172354ef491dbc6bc38caaa00c05" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-mainline-prod am: 2b01f3d22a -s ours am: 408d23121c -s ours am: 427ed2740a -s ours
[automerger skipped] [automerge] switch TelecomManager List getters to ParceledListSlice 2p: d54a48f42a am: b8de3562fa -s ours am: 7bfe5e24c0 -s ours am: 3a0e25921a -s ours
Diffstat (limited to 'libs/androidfw/Util.cpp')
0 files changed, 0 insertions, 0 deletions