am 0a76e80b: Merge "Fix extern "C" guards."

* commit '0a76e80be826cf7928ab554c303d4f9591b59b27':
  Fix extern "C" guards.
This commit is contained in:
Shawn Willden 2015-07-10 12:11:34 +00:00 committed by Android Git Automerger
commit b43c470125

Diff content is not available