Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: 83810d0665 -s ours" into nyc-mr2-dev-plus-aosp

am: c047919893  -s ours

Change-Id: Id379463b11eb082a1a066aa245d618cd1d091178
This commit is contained in:
Bill Yi
2016-12-08 18:23:07 +00:00
committed by android-build-merger

Diff Content Not Available