Skip to content
Commit d0680538 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-r1-dev 

am: 2c14f3f9 -s ours
am skip reason: subject contains skip directive

Change-Id: I30cb4d57dde6ff8aafd65c849a1a011a77d86bb4
parents 97916f9e 2c14f3f9
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