Skip to content
Commit 43ee27f9 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: aa0ebd7d -s ours
am skip reason: subject contains skip directive

Change-Id: I20abdd0866faa94de019f2fe530fe833114796e6
parents 4cbdb405 aa0ebd7d
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