summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Mark Hansen <markhansen@google.com> 2023-09-06 23:40:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 23:40:33 +0000
commitd74c2a1781d4fe997a7f8cb08f043585a41f0910 (patch)
treed4ddc36066d011785e241f6f2bbc384fc4f0ead4 /libs/androidfw/AssetManager2.cpp
parent2c4b39a2fb2c102e9e25d4a957400ab62cc1e11b (diff)
parentb303b74e0fa22c1167cfc668e8eb50c99688400c (diff)
Merge "Revert "Move @ViewDebug.ExportedProperty annotations from private fields to public methods"" into main am: b303b74e0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2743274 Change-Id: Ieb95cea82fce3140a4022606ee430c2837826284 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