Skip to content
Commit 27df4716 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: ad8a5939 -s ours 

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

Change-Id: I92946352d33dde8674731be448b73d8b972abb9f
parents 7a24f888 bf00a737
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