OSDN Git Service

Merge "DO NOT MERGE Truncate new line characters when adding string to config" into...
authorHansong Zhang <hsz@google.com>
Sun, 11 Feb 2018 03:46:46 +0000 (03:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Feb 2018 03:46:46 +0000 (03:46 +0000)
am: 9d938490c8  -s ours

Change-Id: I749181d35395cce99bd0dd9238174603137189fc


Trivial merge