summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:53:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:53:34 +0000
commit9a382decde13f1d385b21d7790b84f0fe2a389c1 (patch)
tree990d3c5a2fd0e4d1ab2c6523bb04c45920ced667 /libs/androidfw/ResourceTimer.cpp
parentb6fce8a47ac166644ce86833eb553f3249f5581d (diff)
parent9d000dcf5fd6a63a84b54dcb1f7aff5119c61778 (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 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: I20a635b2ef3d041b04e913ad0a6094ff88759edf 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