OSDN Git Service

Merge "Make all of ndk_cruft.cpp one big extern "C"." am: 9dec0a775b
authorElliott Hughes <enh@google.com>
Mon, 7 Dec 2015 23:39:33 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Dec 2015 23:39:33 +0000 (23:39 +0000)
commitc94e2613487043ae100ca185121702cf77b85aaa
treeebc42e167fb1006aaef69699b543bfb321f20804
parente122edac1ae04822451842b93cc9ffde017c0182
parent36545d2e7621d87f68aed620d1c99a9c0f0fbf94
Merge "Make all of ndk_cruft.cpp one big extern "C"." am: 9dec0a775b
am: 36545d2e76

* commit '36545d2e7621d87f68aed620d1c99a9c0f0fbf94':
  Make all of ndk_cruft.cpp one big extern "C".