Commit 497b48c7 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

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

am: 9ff03058 -s ours
am skip reason: subject contains skip directive

Change-Id: I33885c17e3b416594b65335f58cc4d7469bcc1a5
parents ff8f1034 9ff03058
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