summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 23:20:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 23:20:45 +0000
commitd4de732dd649a32045b16bfdeb071877e796d211 (patch)
treefff9418202b80777a7064b98ac66911e04bd17b7 /libs/androidfw/ResourceTimer.cpp
parent03fc9cdc36daab8d6cfcc52e57185f62224af577 (diff)
parent7848fdd564057be2a87daf6418a3871e2218771b (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 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: Id1e7fa695549bdb4cab455000626f5246d95ad45 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