| commit | 6842ac0e681f81417c83ed98912a7e9c4bcce66c | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri May 16 09:13:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 16 09:13:02 2014 +0000 |
| tree | 76629ee11e3864ad1b1c26377b986bc8d08b6431 | |
| parent | 2b7d6877b6d6effdd8905086234da0fbaa7af63b [diff] | |
| parent | 60a5531a0311d72648443a4cec4476c3cdbe7cfd [diff] |
am 60a5531a: am 9c7703d3: am c006db38: Merge "Workaround for multi-line comment error when compiled with g++." * commit '60a5531a0311d72648443a4cec4476c3cdbe7cfd': Workaround for multi-line comment error when compiled with g++.