tree ff625a94bf650d3a7db5070f9e3bd65c65b15158
parent dfc64bfaa9551eeb4117e87d5dcd1b59929c326d
parent db02746757572390431db19a5337cc8313ee4a62
author android-build-prod (mdb) <android-build-team-robot@google.com> 1588874929 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1588874929 +0000

Merge "Merge cherrypicks of [1305537, 1305538] into ndk-release-r21" into ndk-release-r21