Skip to content
Commit d6d43aab 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-dev am: a5121a4f -s ours 

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

Change-Id: I348b2718f8391155067a6faa325bb8e1cfe2b849
parents 4d662f8e c4cedfc4
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