summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Oli Lan <olilan@google.com> 2022-08-24 18:17:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-24 18:17:51 +0000
commit15161951222e291d80d01e77ad74057a6a7c0104 (patch)
tree805ddd924eeba024adcdc530648abca992711b09 /libs/androidfw/ResourceTimer.cpp
parent9852f012660401ba40bce887798581c6a22b59ce (diff)
parent4bdb2ee120830ff911b02bfe5ba03ed81ed87293 (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: 4bdb2ee120 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979 Change-Id: Ib2e79958fa77660e9b05ceb811e154b794fb91bf 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