Skip to content
Commit 47331f14 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: b672a3f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I4705ff9613fad55896b585fe052a8c95a3a4aeaf
parents eec208ec b672a3f6
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