diff options
| author | 2023-12-05 17:03:39 +0000 | |
|---|---|---|
| committer | 2023-12-05 17:03:39 +0000 | |
| commit | 9b3f4ff0a5b49184ac34b10634a883bf51755d05 (patch) | |
| tree | eaef6d899ad7c9e7ff844edf1a94b51173a49ecd /libs/androidfw/FileStream.cpp | |
| parent | a04666c91b0eb6be33aef499a0c22b989e4e3ad5 (diff) | |
| parent | 337558384401eb9e541a60a36b692cb311874bee (diff) | |
[automerger skipped] Merge "Handle screen capture disabled state for multiple users" into tm-dev am: 925eb31c07 am: 6932b02fb6 -s ours am: 2d25c9b0b5 -s ours am: 4c364eedcd -s ours am: 3375583844 -s ours
am skip reason: Merged-In I9da7b026e937a9e729777b4de613b319a4084418 with SHA-1 3b2c9426e4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262286
Change-Id: Ifd640d6736dc2e80124eef22350ac509e0e18a62
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