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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 

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

Change-Id: I244af3f5f86162bbf55f4ce64deaed6397b946e1
parents f1ef4441 e6cde6e1
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