summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Mark Hansen <markhansen@google.com> 2023-08-24 22:50:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-24 22:50:52 +0000
commitf5e5b53e6909a79a61203931bb4079497a81fe13 (patch)
treec27f6e784716eefa9644663dd41a9ebd7e39c729 /libs/androidfw/AssetsProvider.cpp
parent123a3d4146ee53eb5b3edc4a2014e63f522578eb (diff)
parent9a1e46321c877a4b8058dadc3b89a89979ab4622 (diff)
Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b09104 am: 9a1e46321c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2724953 Change-Id: Iffda70c017c2d0134e81a91a7813e498c78887d1 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