Skip to content
Commit a9cd5d94 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: 4ffaa9a2 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c11f98769577ae9485a2fe4a7a726c7d6ca9e4
parents 49a60e6b 4ffaa9a2
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