Skip to content
Commit 733e924a 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-qpr1-dev 

am: eec208ec -s ours
am skip reason: subject contains skip directive

Change-Id: Ia7630a86426861311b8ddbc42d50ae62bfc42b1e
parents 75a83ca3 eec208ec
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