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

Change-Id: I98cf4fdb78853f9f7590d72f46372c796b909c67
parents dc8467d2 daeb1bb8
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