diff options
| author | 2023-09-15 21:44:16 +0000 | |
|---|---|---|
| committer | 2023-09-15 21:44:16 +0000 | |
| commit | 33902126bb4be09ea622d8c42fe3e1b2bcbf114a (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | fb6ca21bee90eeae666e3a5c4bba9da9e7738d7d (diff) | |
| parent | aa805d1ff6cba73788b84255a34e5fe3e6da55af (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230
Change-Id: I28187d945eaa35161d0244c76d554e9a33ead479
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