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

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

am: 33a3158f  -s ours

Change-Id: I7ee7137544ae83b425ac8c75edbbdb89734dbf41
parents a6354154 33a3158f
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