Skip to content
Commit 358c2af5 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-dev am: ab6ef4f0 -s ours 

am: 3633c30c -s ours
am skip reason: subject contains skip directive

Change-Id: If60e3e6e1949a8cd0d49a48b1a3ed4ad5281961f
parents 07814412 3633c30c
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