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

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

am: 5f83b0c3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8e3261007d892e9be41736d3a12e210896fdbe8b
parents 9f4656b4 5f83b0c3
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