am 7d831871: Make string literal concatenation play nice with C++11.

* commit '7d831871032675e252490b52ddbb29a63e5497bf':
  Make string literal concatenation play nice with C++11.
This commit is contained in:
Dan Albert 2014-09-09 16:34:35 +00:00 committed by Android Git Automerger
commit 4762e6f254