| commit | e5e9f93033d366c9f002f215d072d25e5658598e | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Fri Jul 10 12:24:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 10 12:24:24 2015 +0000 |
| tree | 6c46c3cdc22e0e21e23eee7fc5141dd722971efd | |
| parent | bc4ac8880033cddd0706cd377c1be280844e2ad3 [diff] | |
| parent | 8ec920226e0c8f393e2c81389bdca8ed2c4282fd [diff] |
am 8ec92022: am 0a76e80b: Merge "Fix extern "C" guards." * commit '8ec920226e0c8f393e2c81389bdca8ed2c4282fd': Fix extern "C" guards.