Commit 92828ea8 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1ab21582 -s ours 

am: 965f9306  -s ours

Change-Id: Ibf12d118dd744f824aa4f6ee066b41af8e215110
parents 9a7fc40e 965f9306
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment