Skip to content
Commit 1f0c829e 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: 3b7a08e3 -s ours 

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

Change-Id: I6804d55b30fbd9ca1ca87a304f99dad581d9a949
parents 3dad2268 afd4ef1d
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