Skip to content
Commit fc798ad2 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: 6aa3f389 -s ours 

am: 1daf3587 -s ours
am skip reason: subject contains skip directive

Change-Id: Iacbe765bde8186815348d60fcdc2cbac47c2f24a
parents dff17fc1 1daf3587
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