Commit 2c034379 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Import translations. DO NOT MERGE 

am: b5379354 -s ours
am skip reason: subject contains skip directive

Change-Id: I0bb334c21cf195b6fd217d45ebcf3775b095278d
parents e326f33f b5379354
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