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

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

am: d4e9e430  -s ours

Change-Id: I4746838df8aa9d2735eaad669a982bd6d2a241db
parents 457f42c0 d4e9e430
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