diff options
| author | 2023-09-18 22:27:57 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:27:57 +0000 | |
| commit | 9e1d2f1d0a9d93a94ca1bf4ad500ae7cef5bf7f5 (patch) | |
| tree | b665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp | |
| parent | a5b7290362f306192ccd7b1c25488ac8d69bc407 (diff) | |
| parent | 15c2341cd3c7ddeb16c11bffa7c4b80a9b76626b (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 1cb52a9c10 -s ours am: 183f01aab6 -s ours am: 15c2341cd3 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144
Change-Id: I43568f59cf097e333f4acc4fd758aaaf65d9a76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions