Skip to content
Commit 35b69206 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: 3a0a965c -s ours
am skip reason: subject contains skip directive

Change-Id: Ia31264bebbd0ad2da96f7b84bd3b386302a885ca
parents 1d010ab1 3a0a965c
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