Skip to content
Commit 453efcb3 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: c0004871 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e86585ab4889e0c764b5ea09f8bb3053dde7c42
parents 7e5f2498 c0004871
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