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

Change-Id: I7fb9404482659f6428c8a0e5f2ebd80498e1147f
parents 67232a88 949a22d7
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