[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: 6c6837424d
-s ours am: ba8e20218e
-s ours am: 39e41746e2
-s ours
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: Idf975befc9c69241753d207aba9f9d17b80c6677
This commit is contained in: