tree 5d59b7904026d731c9c4794a4b35ff46d7d22586
parent 4419e86d86bbc97626b1aaf192b5a762cccfde5a
parent d74c2a1781d4fe997a7f8cb08f043585a41f0910
author Mark Hansen <markhansen@google.com> 1694046632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694046632 +0000

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>