commit | 75335b2489ad1706808cfab8ec08ea38868c4a2d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Sep 10 19:48:57 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 10 19:48:57 2020 +0000 |
tree | 96d3320fa24a1aa2160e56ef7d8157d653cc0f9b | |
parent | 5bb6e2ceb88b08a9077a737ab88b337c5252169d [diff] | |
parent | 22c391f627c35a56a18528f2d918b4761c1ffbab [diff] |
[automerger skipped] Merge Android R am: ae27a0a500 -s ours am: 22c391f627 -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: I7b6717ef11754324ef20481a78f1fcb258c5e9ca