summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-16 05:38:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-16 05:38:32 +0000
commit5bcb9d6d0540731c23ffee302fd93b572836c374 (patch)
tree554566aee7ab235ff3b831a5b0874e8154abeb8a /libs/androidfw/ResourceTimer.cpp
parent8dfa8142e7d694affac1b2e99a42f2deea63e4de (diff)
parentd17ea7d378792398d9a7622ec43170b74722e27c (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: d17ea7d378 -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: I7b1aefd2d1e2631718ae6ff531b92f9adb37a367 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