Skip to content
Commit 84d6625f 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: 1f6fbcde -s ours
am skip reason: subject contains skip directive

Change-Id: Ife330f63a9eb9895465ff58dcb229110eea28e5c
parents cf9af326 1f6fbcde
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