Skip to content
Commit 8cf0a06f 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: Ia49ec232e49a7af72886cf180b4a93680148b3f7
parents 0f9c0cf7 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