| commit | 58a81ba5066134f8c546d47c7cd3914fd903d9ce | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Sep 09 05:25:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 05:25:03 2014 +0000 |
| tree | f5d5ee629ee721a441dce065e44b28025e073ad1 | |
| parent | 11b9588923d6f3299f183f390c0493c9f6ec356f [diff] | |
| parent | 5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c [diff] |
am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp * commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c': Make string literal concatenation play nice with C++11.