OSDN Git Service

am b43c4701: (-s ours) am 0a76e80b: Merge "Fix extern "C" guards."
authorShawn Willden <swillden@google.com>
Thu, 27 Aug 2015 11:27:56 +0000 (11:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:27:56 +0000 (11:27 +0000)
* commit 'b43c470125e783423e2a668aa9a203db3c52e7e4':


Trivial merge