Skip to content
Commit 6d4ec5e6 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: 2f5007db -s ours am: 7fd9a81f -s ours
am: 506d7424 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c9d7f471ea5f8992dd1a7810b5390d3bfaf7b14
parents 72d61607 506d7424
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