From: Dan Albert <danalbert@google.com>
Date: Tue, 9 Sep 2014 05:25:03 +0000 (+0000)
Subject: am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~539
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58a81ba5066134f8c546d47c7cd3914fd903d9ce;p=android-x86%2Fframeworks-native.git

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

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

58a81ba5066134f8c546d47c7cd3914fd903d9ce