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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 

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

Change-Id: I499e48654a4e1cf8561625ecafb0c433049b69d5
parents 84345490 ed54ec22
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