Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am: 94cd0e4373
am: 04ec2de540 -s ours
Change-Id: I1a3e3a48b8d5cf95a404e18efa2de07a76f035a2
This commit is contained in: