| commit | 2387aeea03226764f6b85e35e1cf395fb3c5b811 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Sep 09 05:16:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 05:16:18 2014 +0000 |
| tree | c08a1f91decfc972beaf398c1e9df4b5128a620e | |
| parent | 50a88ce89fdc169de0f3a20ea2c7eb4026682ccd [diff] | |
| parent | 60803943f8276a311b7f985613b285a60b042886 [diff] |
am a482888e: resolved conflicts for merge of 00fe3544 to lmp-dev-plus-aosp * commit 'a482888ec827aeac0dc38c453fa0b2c2caa3f853': Make string literal concatenation play nice with C++11.