[automerger] DO NOT MERGE Truncate new line characters when adding string to config am: 8ea5dc3511 am: 9b02e373c6 am: 03a9377671

Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c
tree: f1368eb558a70c899162ca87424b367a30763b69
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE