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

[automerger skipped] Import translations. DO NOT MERGE am: b409ec24 -s ours 

am: b2872fd7 -s ours
am skip reason: subject contains skip directive

Change-Id: I9940ce639f970aebcd379f4235dfc920d8db506a
parents 9ad1f9da b2872fd7
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