Skip to content
Commit 2968a449 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: 69d1c9c0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7bd7262b93b4e673131261b812a15fe8d27189fe
parents 0ef8cddc 69d1c9c0
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