tree 96d3320fa24a1aa2160e56ef7d8157d653cc0f9b
parent 2e0fcad4753f26d839fb3bad0ea2f83e69315a24
parent a007ac4b54c649d6e8108697c7dc8291ce8ac3b3
author Xin Li <delphij@google.com> 1599771577 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599771577 +0000

[automerger skipped] Merge Android R am: ae27a0a500 -s ours am: 22c391f627 -s ours am: 75335b2489 -s ours am: a007ac4b54 -s ours

am skip reason: Change-Id I412d75a28135a33f087c5f361ec7ca8c7da91d16 with SHA-1 d0ec81e4b1 is in history

Original change: https://android-review.googlesource.com/c/platform/tools/ndkports/+/1421830

Change-Id: I745fb7d2bceb1a8064dc55f68503e4757efbe7e5