Skip to content
Commit e3943cdd 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: 4ffaa9a2 -s ours 

am: a9cd5d94 -s ours
am skip reason: subject contains skip directive

Change-Id: I46f8087bac81d03cdbda77b07423d514d5ef109d
parents 157a81d9 a9cd5d94
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