tree 3a5ad6fbea5677f86b08c9b99fa0f114694af7b1
parent 8c39c391700063ef0600273d37fa9671a6f884fa
parent 3b51819bb2cb1e6709d975f733e406b3c3b585d7
author Cole Faust <colefaust@google.com> 1700511616 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700511616 +0000

Merge commit '24db25eb2160a04377dd8b278b3cf99a89db914a' into update am: 683dfed778 am: 3b51819bb2

Original change: https://android-review.googlesource.com/c/platform/external/nullaway/+/2831253

Change-Id: Ie7a23a1b37c46467b94d776dbc3a4a9972493a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>