Skip to content
Commit 1725eea1 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 skip reason: subject contains skip directive

Change-Id: I305f8ae441fc1161b9e82eb09252befb8bd439ed
parents 6fcdd823 d1c47854
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