Commit 510596c1 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Import translations. DO NOT MERGE 

am: 6d910c42 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d0b8a72d7ddccf34c27c02639dddd1d8933dc3d
parents 36b60b46 6d910c42
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