summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-28 17:33:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 17:33:44 +0000
commitb64d4bbbeaa52e749a17167767c67eb8fbc17911 (patch)
tree95f881578fc9b4408029f3d7e830343c172cfcdb /libs/androidfw/ResourceTimer.cpp
parent35d0f6933f07835a7b0df048ac9ddeb7636ad5c2 (diff)
parent12032fc4922235fb7edfd428a4b782d4d547d8b5 (diff)
[automerger skipped] Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb am: f76ea6006a am: 5e2b9a43ca -s ours am: 12032fc492 -s ours
am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d3a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748987 Change-Id: I72d9831812bce37f1d7703a807b2b98f064fec1b 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