Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 58a81ba5 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

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

* commit '5273a978':
  Make string literal concatenation play nice with C++11.
parents 11b95889 5273a978
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment