Skip to content
Commit f09d1c3a 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-r1-dev 

am: ab5629ef -s ours
am skip reason: subject contains skip directive

Change-Id: Ifca8c42c8d26580200deb2578becf7a73cb96d51
parents 6f47e128 ab5629ef
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