Skip to content
Commit a1d096a7 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: d07bcd4b -s ours
am skip reason: subject contains skip directive

Change-Id: Ida895ee7f9cffe27c564346f620bb385f3c36c79
parents bb349cb2 d07bcd4b
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