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

Change-Id: I6c24f7b39ddbc23e9da9fea78f8099b12238f8c7
parents 680695de 5e0da71b
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