summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-16 00:59:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-16 00:59:38 +0000
commitbbe8ffd168b4879d2d63c176a57e67fa467a29f3 (patch)
tree54811cd72f9a02a9b59a46e35910f94de675886c /libs/androidfw/ResourceTimer.cpp
parentf4d2fb4c3844934c85e8b00b3dfeb292b84bdb8b (diff)
parente00c64b8fd6a7e54e54a6179efcca5aa1a892962 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours am: 467fe36031 -s ours am: 4c43a3dd22 -s ours am: 5dad605132 -s ours am: 22aa20cd3c -s ours am: e00c64b8fd -s ours
am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 dba7ceb57e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19942837 Change-Id: I2cc131154e312e642f353bb817e8a41feb5b41f3 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