Skip to content
Commit bbd77995 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: 55a53882 -s ours
am skip reason: subject contains skip directive

Change-Id: I52effac4c8dffd2af941cc7fc5e2b32c0df7ea62
parents 67798fc3 55a53882
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