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

Change-Id: Ib7f0f5eadb66cb0389b29d792831d1f546bafc92
parents d1809212 cc13f9ed
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