Skip to content
Commit 538d28e1 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f389 -s ours am: 1daf3587 -s ours
am: fc798ad2 -s ours
am skip reason: subject contains skip directive

Change-Id: I8965e70881c05869a0acd6266efed16f59eea9ed
parents bcf4aa6b fc798ad2
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