Skip to content
Commit 5304b688 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 

am: e6283fda -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1a96c377e498aabfb115eb3b22f07812e7d037b
parents 714e449f e6283fda
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