Skip to content
Commit a7df76d3 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: 311594b6 -s ours
am skip reason: subject contains skip directive

Change-Id: I9c26510b0c925d3f260afa21914770bb7ba74187
parents 9d86289f 311594b6
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