Skip to content
Commit 8e88028a 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 5de09b24 -s ours am: 7488d6df -s ours
am: 26aba21b -s ours
am skip reason: subject contains skip directive

Change-Id: I2dfb2378da93e56f8b2107509a4d763f9ade939a
parents c841bddc 26aba21b
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