tree ebc42e167fb1006aaef69699b543bfb321f20804
parent 1190230f3316bc26804c60cdd1a859f09c7f11ca
parent 9dec0a775b07f58d133ae5c35713e7cf60ddcc7c
author Elliott Hughes <enh@google.com> 1449530203 +0000
committer android-build-merger <android-build-merger@google.com> 1449530203 +0000

Merge "Make all of ndk_cruft.cpp one big extern "C"."
am: 9dec0a775b

* commit '9dec0a775b07f58d133ae5c35713e7cf60ddcc7c':
  Make all of ndk_cruft.cpp one big extern "C".