summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Liahav Eitan <liahav@google.com> 2022-10-31 13:53:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-31 13:53:54 +0000
commit1931c840be58cac59b7bcfe6e9f4de5dae2fcb7e (patch)
treedf2875ce72b4bcae321ab4b709b081d606468b37 /libs/androidfw/AssetsProvider.cpp
parente4085c140ce21f3803135185a6291f03871d7e62 (diff)
parent25598f8fae3cbd52a5bee15dd4bb395a54b41b45 (diff)
[automerger skipped] Merge "Fix sharing to another profile where an app has multiple targets" into tm-dev am: d4b70649db am: 82233a5272 -s ours am: 25598f8fae -s ours
am skip reason: Merged-In Ib41c8a3c46afcc2d62a4c1a924212bcd98bcfbe4 with SHA-1 a4fe4bd9a2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20222490 Change-Id: Ia8a2b90283c0f280a2aa7ca1abcf8e4ecf726354 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions