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

Change-Id: I6c1d62458eb5d1aad5a02877bb4dbc1bf7239bf9
parents d1f08c58 452be496
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