summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 23:07:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 23:07:23 +0000
commit74c103467a85e472a3e2b55959b981b8786c5056 (patch)
tree68604736f5d7e307b5bdd124333b10e4ad329bcf /libs/androidfw/ResourceTimer.cpp
parentcc568d3cbd60be5b48d2a0251b2ba55f9868cb43 (diff)
parent9a382decde13f1d385b21d7790b84f0fe2a389c1 (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 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: Ic570f8a6d969209b001406a7035e54f54b369d06 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