tree 18dcca5943104a68d441e17ac810ef4b8785b2ef
parent bed20d646c07611ecedeeb2ad4d03fbafc1f3546
parent 631256ac3532e70fbd170225a86d2330100d09d3
author Christopher Ferris <cferris@google.com> 1680821489 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680821489 +0000

Merge "Add annotations." am: 80e5ee7e23 am: 631256ac35

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2528259

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