Skip to content
Commit 157a81d9 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: cc13f9ed -s ours 

am: 49a60e6b -s ours
am skip reason: subject contains skip directive

Change-Id: If902517cdbff58fe1f091e50aa6e9de836af376c
parents 75f383fa 49a60e6b
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