diff options
| author | 2022-06-24 01:49:07 +0000 | |
|---|---|---|
| committer | 2022-06-24 01:49:07 +0000 | |
| commit | 3877dc83522460a488f1d3ae364484e96250763c (patch) | |
| tree | 3a8e7671a8f6f9a6484d58fe29125b8041348875 /libs/androidfw/StringPool.cpp | |
| parent | 45c010340e711caf61413aeec7870bbb0b32289d (diff) | |
| parent | 700e0acc4f026de24dd746dc0723cda9cd517d6b (diff) | |
Merge changes from topic "am-4a94c5aa144e4bda8edcbb2f691333dd" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "cherrypick-SPOOF_PACKAGE_NAME-zoqa9prsry" into sc-mainline-prod am: 05688a7e23 -s ours am: 4bb4859149 -s ours am: 4874a851f3 -s ours am: 04823598d8 -s ours
[automerger skipped] [automerge] Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions. 2p: eef20391ce am: 8657d8e59b -s ours am: 75cb925622 -s ours am: 86021107e6 -s ours am: 7d76408e1f -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions