summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Anton Potapov <apotapov@google.com> 2023-07-31 19:12:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-31 19:12:09 +0000
commit56f8490e1368ce424573c98d9bffc431ea592ae6 (patch)
treedac73ccd3325d90e46b711266ed85655fad1227a /libs/androidfw/FileStream.cpp
parent51bd486bba1295cb335a3de2c63ddf4c9a97fc95 (diff)
parentbc5800df32269101bebec01b1520d6c36e36efe2 (diff)
[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into tm-qpr-dev am: 4ee9dc1682 -s ours am: bc5800df32 -s ours
am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739fab is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24212143 Change-Id: I8f18e68b81733d35c15fafec336e7db423bd6523 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