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

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

am: dbdd0389  -s ours

Change-Id: I9259ffb054cb66094cc61abc4bccadad31ebb3fe
parents 7e6b6891 dbdd0389
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