summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:51:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:51:43 +0000
commit4c43a3dd2293b6df146798a6e5b6bfc5d1fba947 (patch)
tree940295413c4be3013b1655b2efdc11cf939b292f /libs/androidfw/ResourceTimer.cpp
parent34ea3b2cf1761490ad0bb07fba36155bc049904b (diff)
parent467fe3603125ff422fbd8d3e5a61f981ee36ca22 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into rvc-qpr-dev am: 61ec81ae9b -s ours am: 467fe36031 -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: Iff1060f06f578e587f9bb551582fb67b825544fe 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