Skip to content
Commit 56ab84ad authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 80bbe491 -s ours 

am: 8cf0a06f -s ours
am skip reason: subject contains skip directive

Change-Id: Ifcd08e8339720aa7109ef51d89ea3a6b7daf00f3
parents 01cd18b8 8cf0a06f
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