Skip to content
Commit 0a7c2433 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: 2080a059 -s ours
am skip reason: subject contains skip directive

Change-Id: Id01bda17502dcc4644e76ea1771aa0b1eb64d38d
parents a7df76d3 2080a059
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