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

Change-Id: I2c2e73ea75e5e37b978d26bf933e036c31e42300
parents df2cca32 ba8291e6
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