summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-16 05:36:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-16 05:36:59 +0000
commit1c528e4b71eb5ebfb33e9b97e2c42437323d4e6d (patch)
tree554566aee7ab235ff3b831a5b0874e8154abeb8a /libs/androidfw/ResourceTimer.cpp
parent4831043dd278a4d7fcd749c4cbf3eb94053901c0 (diff)
parentd4de732dd649a32045b16bfdeb071877e796d211 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours am: 74663b3683 -s ours am: 61e5224009 -s ours am: 7848fdd564 -s ours am: d4de732dd6 -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 2d6eae165b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19942600 Change-Id: I37cbf4d36572c0ad75a3483a1dd6bd2a433ea533 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