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

[automerger skipped] Import translations. DO NOT MERGE 

am: 21caa6f1 -s ours
am skip reason: subject contains skip directive

Change-Id: Id888bed48ac77a605fe027e820a27e0cad2c32b5
parents 67e8c15d 21caa6f1
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