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

Change-Id: I7cab4723bd37a635830f8fff25bd80e51367dd15
parents 59f2ac12 011a17e5
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