Skip to content
Commit ae54b7da 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: 80bbe491 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf26109ee01cc4264b7f046bdd8963f0e95a51f4
parents c4ef1973 80bbe491
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