tree 859140d1a2e54d78bb47a8d31463cdb6425f2925
parent 3057bc27d5f23bf97fc140bc35c3ab2e03077a5c
parent 766bcc63f841044e0ab1bd4fde35fd6226ff5b42
author Dan Albert <danalbert@google.com> 1479158014 +0000
committer android-build-merger <android-build-merger@google.com> 1479158014 +0000

Merge "Fix NDK modules."
am: 766bcc63f8

Change-Id: I06f2d7ae758678b50b8f75386f59c2e257018d31