Skip to content
Commit 535a6f9d 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... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 680695de -s ours
am: c04f152b -s ours
am skip reason: subject contains skip directive

Change-Id: I45e46694050847fac68a8a6ad46ae0378f68c0ed
parents cb64a627 c04f152b
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