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

Change-Id: I1811f11e75eb4dd6305dd827f506efe47c1b6b85
parents 48dcfd57 c7800c59
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