Skip to content
Commit 4cbdb405 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: 79548ac5 -s ours
am skip reason: subject contains skip directive

Change-Id: I6b11220567a0491323c6eb2ff0f7527a0d00ac26
parents 66589029 79548ac5
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