Skip to content
Commit 2b4e621a authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 79548ac5 -s ours
am: 4cbdb405 -s ours
am skip reason: subject contains skip directive

Change-Id: If8c3de9fc3fc68b90aa564c4ff35160e79c4b4f9
parents 22fae4aa 4cbdb405
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