tree 6e39ada1ddc93ab1f5f67a5358bdd6d952c2aff8
parent 2778556ebb574c1da3e31f3dd858ec3621909bae
parent cd2360673f8c60f06c78ce66116a8c02dd60824b
author Dan Albert <danalbert@google.com> 1650485993 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650485993 +0000

Merge changes I2ae26513,Iddf3993c,I94bc5994 am: c788e51725 am: cd2360673f

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ndk/+/2067533

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