Commit 9cd92c54 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Import translations. DO NOT MERGE am: 7fabfae0 -s ours 

am: 32c98747 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b23cb7d6f5130ddff3ddce2dce0a6264035b1b7
parents 28d0ed19 32c98747
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