summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 23:04:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 23:04:46 +0000
commit33a35ca1befda4301810a06f8a58e41c759fc285 (patch)
tree68604736f5d7e307b5bdd124333b10e4ad329bcf /libs/androidfw/ResourceTimer.cpp
parenta382ceb5b59fa39b31ffc778ac1dcc93dc430aa1 (diff)
parent798d7a57ac04f6aa555bd54d12b3e98b51c2aa71 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev am: 04d4edbc35 -s ours am: 798d7a57ac -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19941483 Change-Id: I46d80b63087c759eeab4eeae8aa2ef3b4b4cf1f2 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