am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp

Browse Source

* commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
  Make string literal concatenation play nice with C++11.

...

This commit is contained in:

Dan Albert 2014-09-09 05:25:03 +00:00 committed by Android Git Automerger

parent 11b9588923 5273a97833

commit 58a81ba506

4 changed files with 20 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files