Skip to content
Commit b6a11c53 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: b2f78685 -s ours
am: 92867cfa -s ours
am skip reason: subject contains skip directive

Change-Id: I83886cd49436235e4549c26fe73c585f7a3b6d52
parents c3d425fc 92867cfa
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