Skip to content
Commit ad55c659 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: d1c47854 -s ours 

am: 1725eea1 -s ours
am skip reason: subject contains skip directive

Change-Id: I6998cec5d9794a59421d8fa66034562595a4299b
parents ff47f23a 1725eea1
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