summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 16:25:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 16:25:00 +0000
commita937ff5ec248b10877cb5d6bcd247a88d8386016 (patch)
treee680dee6eccac73738f9c7d8b325f74fc6f62732 /libs/androidfw/ResourceTimer.cpp
parent81f6691072dbc7a75e047dd6fb0d01c761862ded (diff)
parentfef8d42a562a051f8b96f3c7f8ef232c41aaeabd (diff)
[automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390 Change-Id: I73a2afb3f02ef9eb08d9fec09d760fab44023374 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions