tree e8243d26c0f8c3feea5ccd7866f11f90e91a1e43
parent 14fcfb8a9a157a953b93707c8e1c1b2067a518d5
parent af11c50e67ab63ea2c076cc6ba542843b40ea935
author Elliott Hughes <enh@google.com> 1571241674 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1571241674 +0000

Merge "Revert "-D__ANDROID_NDK__ for SDK builds.""