diff options
| author | 2023-02-23 23:37:57 +0000 | |
|---|---|---|
| committer | 2023-02-23 23:37:57 +0000 | |
| commit | ba24a8caee306ecf4076f58efaeb9acdd577b7c7 (patch) | |
| tree | 1482075daa6e0d92fe3e7417d742cb9263a859af /libs/androidfw/ApkParsing.cpp | |
| parent | eec9dd1d7046555f477f481fe626cdc1dfb0200f (diff) | |
| parent | 200b83cf49c598021c7d9d52e3703ef43082a088 (diff) | |
Merge changes from topic "am-6a3c257b422f4d5ca010f2a9ba3a372e" into udc-dev
* changes:
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into sc-dev am: c59352ed18 -s ours am: 9dad574d1a -s ours am: a6fce7e150 -s ours am: 780c568fd4 -s ours am: 2d3d1c97ef -s ours am: 46da8bd8dc -s ours
[automerger skipped] Revert "Enforce ComponentName belongs to caller app" am: 8b7cf1993c -s ours am: 3261dee3d8 -s ours am: 0983f6341f -s ours am: 65b1791b99 -s ours am: d8dc5c73b4 -s ours am: f04023e4e0 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions