Merge "Import translations. DO NOT MERGE am: 2f525fbdc5 -s ours am: f8c9a63ca6 -s ours" into oc-mr1-dev-plus-aosp
am: 8c3d164113 -s ours
Change-Id: Ia0dd883921e32839e6ab23f176c7547a3abe2d07
This commit is contained in: