summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Mark Hansen <markhansen@google.com> 2023-09-07 00:30:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-07 00:30:32 +0000
commitb86b29ea7e43316d8a6b4bca8cd87083ce662406 (patch)
tree5d59b7904026d731c9c4794a4b35ff46d7d22586 /libs/androidfw/AssetManager2.cpp
parent4419e86d86bbc97626b1aaf192b5a762cccfde5a (diff)
parentd74c2a1781d4fe997a7f8cb08f043585a41f0910 (diff)
Merge "Revert "Move @ViewDebug.ExportedProperty annotations from private fields to public methods"" into main am: b303b74e0f am: d74c2a1781
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2743274 Change-Id: I16552b8093501af9c2ba25bd80106fc5fff62c52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions