Skip to content
Commit 2e5d3514 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: a7608610 -s ours 

am: 02d6f14a -s ours
am skip reason: subject contains skip directive

Change-Id: I01e68df28f7f865c49e023c8d4a563a9a718876a
parents ed54d0bf 02d6f14a
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