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

Change-Id: I2ac3ec76e4812cc487893e465f21bca7cdd3ef65
parents 7a46c4eb edc7e9b6
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