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

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

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

Change-Id: I83e50bb9d016b4d9f5fdf1b2cd0d24cf3c915eae
parents daffd80e f1ef4441
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