Skip to content
Commit 21fd2814 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: 6aa3f389 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c3d8eb6b098fd39c67eaf48d309372cb0a6a3f2
parents 1b9305b7 6aa3f389
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