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

Change-Id: I877933df5ac53dc38eac4d0cd765f5453a9790bd
parents b2f08840 d0461a53
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