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

[automerger skipped] Import translations. DO NOT MERGE 

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

Change-Id: I31fb6719396c50effb20c8e2516ca109a9b0de47
parents f086e20d 32587539
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