Commit 6166f0ad authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

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

am: 31d0d90c -s ours
am skip reason: subject contains skip directive

Change-Id: I34f3dbf9242d16c0a1fcd194ef86a38e64927e2a
parents 1fa237d1 31d0d90c
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