Skip to content
Commit 37caf481 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: 25a43f36 -s ours
am skip reason: subject contains skip directive

Change-Id: I3e9e158d9cf345d64bf9ea77be78353c388e654b
parents 756636cb 25a43f36
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