Skip to content
Commit 784d0ba5 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: e6283fda -s ours
am: 5304b688 -s ours
am skip reason: subject contains skip directive

Change-Id: I252a730075d90baa8940b5e728ecfcf48875ef5d
parents c10e3ab6 5304b688
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