Skip to content
Commit 17ad0de7 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: 3633c30c -s ours am: 884b0ce1 -s ours
am: 317af336 -s ours
am skip reason: subject contains skip directive

Change-Id: I04a48ae0fd98b4f48e579ebd4287b6146de0a5c8
parents 0eaa620d 317af336
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