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