Skip to content
Commit 3fe67d7a 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-r1-dev 

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

Change-Id: If58d9912c1a65253a8667b55c4c52da6ea3faaa8
parents 7631e62f f4861b71
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