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

Merge "Import translations. DO NOT MERGE" into stage-aosp-master 

am: 218e756c  -s ours

Change-Id: Ia61d86930e6e9290e9ca4d370dae017fe76e3b48
parents 8adf8c7e 218e756c
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