Skip to content
Commit 3bef14d1 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: f5b1101a -s ours
am skip reason: subject contains skip directive

Change-Id: Icbb30a6afd743ba0cbc2c26c043c07a351795cfd
parents 258f5267 f5b1101a
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