| commit | b43c470125e783423e2a668aa9a203db3c52e7e4 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Jul 10 12:11:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 12:11:34 2015 +0000 |
| tree | 77e6dbc6c51f86b4d9cc8e6f3c6d547c49b66512 | |
| parent | 669288c53b0e38a135670827720745d3707a93e6 [diff] | |
| parent | 0a76e80be826cf7928ab554c303d4f9591b59b27 [diff] |
am 0a76e80b: Merge "Fix extern "C" guards." * commit '0a76e80be826cf7928ab554c303d4f9591b59b27': Fix extern "C" guards.