Skip to content
Commit 92c52204 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: 067f9816 -s ours
am: 619b9bef -s ours
am skip reason: subject contains skip directive

Change-Id: I8331b39a6038a579c1e557c8d9c42bc8c0e283ed
parents 549fd862 619b9bef
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