Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours

am: 94cd0e4373

Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
This commit is contained in:
songkailun
2017-11-22 18:57:13 +00:00
committed by android-build-merger

Diff Content Not Available