summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:42:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:42:13 +0000
commit9538034f39243722a96065a50d35aa37446b4759 (patch)
treee977082c48ceff9a2b52658fa8a1834f44f8b3f1 /libs/androidfw/ResourceTimer.cpp
parentee914f2b16f618070ae6c64da0c88dd420433a97 (diff)
parentafab4a1597bc5bc93dc1153e3350c7d0a679157c (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: 514eaefa2c -s ours am: d1a5e1f023 -s ours am: afab4a1597 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: Idf7c61d8ce2f2c3cdd16f3daddac71ff2ba9365d 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