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

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