Skip to content
Commit b1aadaba 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: dc20f9ae -s ours
am: fb1e7e7d -s ours
am skip reason: subject contains skip directive

Change-Id: Ieda3769ead979076201c18ed864d6f791bfa23bd
parents 68e17908 fb1e7e7d
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