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

[automerger skipped] Import translations. DO NOT MERGE 

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

Change-Id: I0c65f5c6aaf40e69e29bba12f8aa470169e12302
parents faeb6691 d1ab5ace
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