[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: ca95aaae17 am: a56081dff6 -s ours

am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 8694c34e09 is in history

Change-Id: Iad3de88305d13e965beb47e908d112475f05e231
This commit is contained in:
Stanley Wang
2020-03-21 06:47:52 +00:00
committed by Automerger Merge Worker

Diff Content Not Available