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

Change-Id: I968bb1d6987ac3baab44a20b642ef4196026a408
parents f5933683 8931739c
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