am b43c4701: (-s ours) am 0a76e80b: Merge "Fix extern "C" guards."

* commit 'b43c470125e783423e2a668aa9a203db3c52e7e4':
This commit is contained in:
Shawn Willden 2015-08-27 11:27:56 +00:00 committed by Android Git Automerger
commit dfc38c3314

Diff content is not available