Commit 1ccfd4f4 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

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

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

Change-Id: Ie7c828781ceb5263d3c3aadbc06a3f5e37fb7990
parents 323d7924 a0732755
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