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

* commit 'dfc38c33143e57d6ab83a76e635684ece8df5430':
This commit is contained in:
Shawn Willden 2015-08-27 14:43:20 +00:00 committed by Android Git Automerger
commit 2fd07baedb

Diff content is not available