Merge "DO NOT MERGE translate arrays in Settings/res"

am: 992a4e5500  -s ours

Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
This commit is contained in:
songkailun
2017-11-22 18:49:59 +00:00
committed by android-build-merger

Diff Content Not Available