summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-16 00:59:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-16 00:59:58 +0000
commitc33b7c7d9223864555933dc551aca9e2e0e62e64 (patch)
tree54811cd72f9a02a9b59a46e35910f94de675886c /libs/androidfw/ResourceTimer.cpp
parent3800154ac3b8acd5ae3f162ac66fdb8d5d3a42f2 (diff)
parentc26caf678fa6b472682920de9ef4e7154fa94a27 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-dev am: 74592430e2 -s ours am: 98ba0a3f7a -s ours am: 0511109afb -s ours am: 9d000dcf5f -s ours am: 9a382decde -s ours am: 74c103467a -s ours am: c26caf678f -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 538654167a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19943344 Change-Id: I8ff6f49f05714c7ffe316c4d0a061b1f9a518c65 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