summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 17:46:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 17:46:43 +0000
commit4bdb2ee120830ff911b02bfe5ba03ed81ed87293 (patch)
treee977082c48ceff9a2b52658fa8a1834f44f8b3f1 /libs/androidfw/ResourceTimer.cpp
parent80f806679254de6bd04f13113f7d4f8f8d998f2c (diff)
parent620cc32ffe3a4fc0b6f2a8c4b2f72372f61082e7 (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: efd6628052 -s ours am: 620cc32ffe -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: Idf32ede5824a23372d3833f90872553459f8199e 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