Skip to content
Commit 8e2475f3 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: 4ffaa9a2 -s ours am: c185e17a -s ours
am: 3c78aefb -s ours
am skip reason: subject contains skip directive

Change-Id: If6618639e9091c3c6cf958215dd8ef9fa2944b6d
parents 92c52204 3c78aefb
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