summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 22:51:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 22:51:26 +0000
commit74663b3683d773fe3c186d91c9a15bc91c91fee0 (patch)
tree940295413c4be3013b1655b2efdc11cf939b292f /libs/androidfw/ResourceTimer.cpp
parent04d4edbc35b7515b72c8f2444e3d9b627c9369b7 (diff)
parentb2abf2632c42f7c5af75d19aed0595605570efdd (diff)
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf2632c -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: I704d29a70180c14c745a41f867742d1e689a2434 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