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

Change-Id: I04fc8e4500c1b067784db2c9dea3a08527459860
parents d08ca5e4 d4795138
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