summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 23:21:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 23:21:10 +0000
commit9df43d1119b31208fa8cf7c2ed988331d62c7d65 (patch)
tree617fffa5dedc08a0e9afd98ebd8563a745f9e2c9 /libs/androidfw/ResourceTimer.cpp
parent511f69c1871e2ea3bdf47725805df6e7b740fda6 (diff)
parent33a35ca1befda4301810a06f8a58e41c759fc285 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev am: 04d4edbc35 -s ours am: 798d7a57ac -s ours am: 33a35ca1be -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: I5b837c118995e33c7addc346880b42482fc40456 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