summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2023-06-12 14:28:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-12 14:28:04 +0000
commit9bba082dacdfe0103bf17b96927107b1f05bdb05 (patch)
treeb0b6e91d1b2b99810838ed22a7422e499ca62c38 /libs/androidfw/FileStream.cpp
parent50656ddbecfdc1f6fd27f7476281bff08c923735 (diff)
parent1a4893e7518c8e5548e3d46fcb408644c36d6f94 (diff)
Merge "Don't enforce android.permission.TURN_SCREEN_ON in UDC." into udc-dev am: 4360e144f4 am: 1a4893e751
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23635699 Change-Id: I4592a64940502171b30544c136c057f240dbc39b 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