diff options
| author | 2023-10-04 04:55:05 +0000 | |
|---|---|---|
| committer | 2023-10-04 04:55:05 +0000 | |
| commit | 2804cfadb8fe5b269748c1c4dad645469ff637f1 (patch) | |
| tree | a4049f35c2e0b1c3ded2166dd5e0af8a74b01d77 /libs/androidfw/FileStream.cpp | |
| parent | 92d8021222b3f34287846de2bf5c8899ecc20bc7 (diff) | |
| parent | 9459a24409cff926d4d2ec4d334486300295cb6e (diff) | |
Merge changes from topic "am-cc2061a0bd214cae81ba61ffef2304a6" into udc-qpr-dev-plus-aosp
* changes:
Merge "[automerger skipped] Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: 7ffa627afc am: 9991339676 -s ours am: 92c1d53ff7 -s ours am: ffb3a20b9f -s ours" into udc-d1-dev-plus-aosp am: 687e706a7f -s ours
[automerger skipped] Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: 7ffa627afc am: 9991339676 -s ours am: 92c1d53ff7 -s ours am: ffb3a20b9f -s ours am: 788c66ec33 -s ours
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions