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

[automerger skipped] Import translations. DO NOT MERGE 

am: 7fabfae0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic066f48e68bdeea59cb2125063cb5885d94dc80f
parents 3bc227b9 7fabfae0
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