tree 96d3320fa24a1aa2160e56ef7d8157d653cc0f9b
parent 01e16af09bccbf6012d13935717798c7ba1c2dbb
parent 44beb13dabbb0f74fb3f29d789d82d310ccb2d1a
author Xin Li <delphij@google.com> 1599773449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599773449 +0000

[automerger skipped] Merge Android R am: ae27a0a500 -s ours am: 22c391f627 -s ours am: 75335b2489 -s ours am: a007ac4b54 -s ours am: 44beb13dab -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: I3cc7904edcb9fdd0730122256cc3d899c4595e5f