Skip to content
Commit c10e3ab6 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a1a6fe2b -s ours
am: e05e9587 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia018e3f8e6f71b61ece0595deae8106f0b50e21c
parents 05ae545c e05e9587
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