Skip to content
Commit afd4ef1d 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: 3b7a08e3 -s ours
am skip reason: subject contains skip directive

Change-Id: Id3eeed6a368072136959013b03f8dc1a6cf79793
parents e6cdb8e3 3b7a08e3
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