tree 96d3320fa24a1aa2160e56ef7d8157d653cc0f9b
parent d403b58ca718022b41d3298d167a800f010b06d8
parent 75335b2489ad1706808cfab8ec08ea38868c4a2d
author Xin Li <delphij@google.com> 1599769256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599769256 +0000

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