[automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648
am: 2c60eb8851
-s ours
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790
is in history
Change-Id: Iade0e884c0b5e98704e6892b1cbbd66b0d3d9c36
This commit is contained in: