tree 773d5e3500cc083151aa06c8229d0d784000c29c
parent 57f01b91d7812d7432bce4f8167953d72b613e64
parent 9823c926b2d3938b4645d347f570ff516fb8dc98
author Elliott Hughes <enh@google.com> 1570633775 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1570633775 +0000

Merge "Restore __ANDROID_NDK__."