Skip to content
Commit 3fa31fb1 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: fe2d421f -s ours 

am: 5c0d577d -s ours
am skip reason: subject contains skip directive

Change-Id: I8137f4945cc640f35f7de41ca90ba9c3ece572a3
parents 78d9978f 5c0d577d
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