Skip to content
Commit 2c731e21 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7 -s ours am: c05f11a0 -s ours
am: b8344d6d -s ours
am skip reason: subject contains skip directive

Change-Id: If8b07235096e290994721d5e6e3a445d15243a00
parents 25391043 b8344d6d
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