| commit | a45b4721d9b2bf37ad11ffcb4996e73a6bf4743c | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Mar 19 01:47:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 01:47:42 2015 +0000 |
| tree | 5006cc0c301d53e13decd6b6773bb5cb29bc7f85 | |
| parent | d4cb092c25b18d857785f300acb8bad6a28c0f18 [diff] | |
| parent | 4dfbc5e320eaf0bfdc0af242ac16153143d4ba4c [diff] |
am 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS." * commit '4dfbc5e320eaf0bfdc0af242ac16153143d4ba4c': Use extern "C" rather than BEGIN/END_DECLS.