Skip to content
Commit 239d43fd 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: 3fd2f6e0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe8d0289df097cf87a9f81d468ee80bdf78e7094
parents dfbe97e0 3fd2f6e0
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