diff options
| author | 2023-09-18 17:21:24 +0000 | |
|---|---|---|
| committer | 2023-09-18 17:21:24 +0000 | |
| commit | c7cb8c3eb3bcddab5991556ec27776d5e96f9319 (patch) | |
| tree | a5d9609ce0d3e0682ab8a6cacfa60e6026e1dd73 /libs/androidfw/ObbFile.cpp | |
| parent | 6bc4352999aa485fdba47d4404afe6859ff9d95e (diff) | |
| parent | 9b6d709254660d6bb97247345a0f9dc0691690f6 (diff) | |
Merge changes from topic "am-af3d87b9c3b747319cad3033a946b659" into main
* changes:
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours am: f4f4929a4d -s ours am: a8c8808a32 -s ours am: 3fcc68b0f9 -s ours am: 04f114e5db -s ours
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -s ours am: 68b9e06156 -s ours
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions