Skip to content
Commit 292d4c31 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: ab6ef4f0 -s ours am: 6a4598d6 -s ours
am: 07814412 -s ours
am skip reason: subject contains skip directive

Change-Id: If8fecc13cf911b0850a5cff71b74e49fc603f433
parents e14534cc 07814412
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