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

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

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

Change-Id: I9440e99334531740dfe9859e88279ae3b981befb
parents d6dedab0 fdd0c533
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