summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:52:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:52:45 +0000
commit798d7a57ac04f6aa555bd54d12b3e98b51c2aa71 (patch)
tree990d3c5a2fd0e4d1ab2c6523bb04c45920ced667 /libs/androidfw/ResourceTimer.cpp
parentf88c13010821d4277ecacf0ebcbab06151d4ec0f (diff)
parent04d4edbc35b7515b72c8f2444e3d9b627c9369b7 (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev am: 04d4edbc35 -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/+/19941483 Change-Id: Idb1c7d287b515e6aee4bdabe601d20dd1e8193f4 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