summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-02-11 07:54:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-11 07:54:38 +0000
commitf1118d8f5e30a4fc1ed575638f58fa95322ff43f (patch)
treefec39d1e9ba982826bd5af42b0873c234fa91101 /libs/androidfw/AssetsProvider.cpp
parent0d090f1acb783c4a4fda20ed5d132dfb20d8fef7 (diff)
parentebcdd5df688a619c067aa7fd6d61e26fdad17098 (diff)
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity"" into rvc-dev am: 12fb3fb9f6 -s ours am: a6e82499df -s ours am: ebcdd5df68 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16812576 Change-Id: I4d703f020349133fee2ab3e5aef62fbb8d33ec05
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions