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

Change-Id: I25ff80a01eb1816be70b681808078b9ba986d230
parents 37820e6e ad8a5939
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