Commit 02e388a8 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

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

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

Change-Id: I827a34bc9e7b6ed53cabf21d47c60d8c5d136bf4
parents 7ae398d5 ed54922c
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