Commit 0db89131 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

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

am: 3a8aac56 -s ours
am skip reason: subject contains skip directive

Change-Id: I890a86fe0b8c5f287aede5e6c9ae36b4b0bf9196
parents cc5636ca 3a8aac56
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