summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:52:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:52:55 +0000
commit61e5224009d2ce62a0c5972df72a686dcd8de9a0 (patch)
tree990d3c5a2fd0e4d1ab2c6523bb04c45920ced667 /libs/androidfw/ResourceTimer.cpp
parent798d7a57ac04f6aa555bd54d12b3e98b51c2aa71 (diff)
parent74663b3683d773fe3c186d91c9a15bc91c91fee0 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -s ours am: 74663b3683 -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: I1334b4671ffd29e63b6ff11f38ee6f2a68929ed7 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