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

[automerger skipped] Import translations. DO NOT MERGE 

am: 406edaa8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifad6bd7584e2c530b160c10c7dc9c0ba5ed068e6
parents 9c684095 406edaa8
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