summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:52:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:52:03 +0000
commit9d000dcf5fd6a63a84b54dcb1f7aff5119c61778 (patch)
tree940295413c4be3013b1655b2efdc11cf939b292f /libs/androidfw/ResourceTimer.cpp
parent08d869134c6500e37c2dd75ea90a9605d5326697 (diff)
parent0511109afbed92383e18661d4ae6f836b175c9dd (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 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: I647ca1616a27bdb00e4085feffc24f1e391fb884 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