summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Songchun Fan <schfan@google.com> 2022-09-15 23:06:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-15 23:06:41 +0000
commit22aa20cd3c63be2a57a29f34285adb850efd4a81 (patch)
tree68604736f5d7e307b5bdd124333b10e4ad329bcf /libs/androidfw/ResourceTimer.cpp
parentb97331c22e0afa42e8dfb5751be99efe80d0a538 (diff)
parent5dad6051325b3e2dd5a20c541a4612150f4dac9b (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 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: I94ed516dff3e9c64e32ee390965b05ea837669c1 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