From: Hansong Zhang <hsz@google.com>
Date: Sat, 10 Feb 2018 19:31:23 +0000 (+0000)
Subject: Merge "DO NOT MERGE Truncate new line characters when adding string to config" into... 
X-Git-Tag: android-x86-9.0-r1~98^2~2^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9d938490c8;p=android-x86%2Fsystem-bt.git

Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am: 37f93de090
am: 8464a40d75

Change-Id: Id79a1f421f7a88ccabde0b99af0e5ca32d3b68d0
---

9d938490c806732434366f09825c50a07f79e6ab