tree 474d17bdb0eab748130d644ca4e947e43cbe809f
parent 15d46f15d70a87b9d0d677205b01adbb2ad5a2a0
parent e6a83e65d17234b78025cf849219f40ebe70366e
author Colin Cross <ccross@android.com> 1608442586 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1608442586 +0000

Merge "Fix NDK build in downstream branches"