| commit | 60a5531a0311d72648443a4cec4476c3cdbe7cfd | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 16 08:53:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 16 08:53:38 2014 +0000 |
| tree | a45a8a504027acffd7661611f72b201d6122870d | |
| parent | e6ef21c2f0947b2d6af706336e656243d06c4260 [diff] | |
| parent | 9c7703d3d000dd0bf331337dc86bfacb62de486b [diff] |
am 9c7703d3: am c006db38: Merge "Workaround for multi-line comment error when compiled with g++." * commit '9c7703d3d000dd0bf331337dc86bfacb62de486b': Workaround for multi-line comment error when compiled with g++.