Skip to content
Commit b3995514 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: 80bbe491 -s ours 

am: ae54b7da -s ours
am skip reason: subject contains skip directive

Change-Id: I67c4df6787e69d4d7f5ae07384768c97fffbc336
parents 56ab84ad ae54b7da
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