summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 16:05:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 16:05:40 +0000
commitdf9c2c7df0fb033770774626fd844760233f0138 (patch)
tree34f09edcad8060fc3eb48509e67353a2371182f8 /libs/androidfw/ResourceTimer.cpp
parent8a71c13c4a5f7239e400e335a66869043fcfb36c (diff)
parent4bbf0d99f40fd54d66b3eb13b064d3b3f3ec8276 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: Iaf14c2ee5ca03f12c612274e13bc3ea4ba2819ac 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