Skip to content
Commit 850e3c7f authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 

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

Change-Id: I6d6b647cd0e03a3fb530698b6ad0adc4ce2204c5
parents b1547258 a737ae8f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment