Skip to content
Commit e6cea478 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: e0c262b7 -s ours 

am: 067f9816 -s ours
am skip reason: subject contains skip directive

Change-Id: I11064f60646733b0bfc4721f94a84b9e160d5ac1
parents e3943cdd 067f9816
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