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

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

am: db40b0a0  -s ours

Change-Id: I8c503cb6c6d435ee55db8b0614c0583b93d8ec06
parents cacaceea db40b0a0
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