summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Liahav Eitan <liahav@google.com> 2022-10-31 14:58:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-31 14:58:26 +0000
commit0f6b66aa53d5856ca80f8de6d0ab35e1c2c9978b (patch)
treefc63e0f5c954c60cafa6e47533d7aece5701af8f /libs/androidfw/AssetsProvider.cpp
parent2b68d38977dcb838a8cfb272814cc62e394fb36c (diff)
parent1931c840be58cac59b7bcfe6e9f4de5dae2fcb7e (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: 1931c840be -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: Iaa0f39d5188e1e5e4de60ea9c88bb43e9b7dcfdd 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