Skip to content
Commit 70ed26b9 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: 8931739c -s ours 

am: a6e73456 -s ours
am skip reason: subject contains skip directive

Change-Id: Iccd8a20d4268b2de81f006ed55daaa2c4d64237f
parents bb3c59e7 a6e73456
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