summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-09-28 16:35:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-28 16:35:59 +0000
commit12032fc4922235fb7edfd428a4b782d4d547d8b5 (patch)
tree15fb5fa377098bf953a950b94c74fddef6c6ccfc /libs/androidfw/ResourceTimer.cpp
parentfca7e7f0bb62431eb7ac1dc3429aaaa3cccc82fa (diff)
parent5e2b9a43ca43dec72d7fa7ff6a49942132c9b574 (diff)
[automerger skipped] Merge "Prevent exfiltration of system files via avatar picker." into sc-dev am: 43e0f944cb am: f76ea6006a am: 5e2b9a43ca -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: I9438facb689bf947aef046c7ae05d63a7d3136db 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