Skip to content
Commit 2d4c7f4d 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: 7c1a8a42 -s ours
am skip reason: subject contains skip directive

Change-Id: If8db3ca8911802e19a62991e5d820de74fff47e7
parents a61a2613 7c1a8a42
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