Skip to content
Commit 6833e6e3 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: 0d2a5f94 -s ours
am skip reason: subject contains skip directive

Change-Id: I0c8629b4901da29af669faa0f441e1e2e8643780
parents c3ee236a 0d2a5f94
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