Skip to content
Commit 312d2130 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: 801d1779 -s ours am: da046065 -s ours
am: c0491bf9 -s ours
am skip reason: subject contains skip directive

Change-Id: I43f892c18fafc6f2274a7d692e358d0e6bff6129
parents 26fdd23b c0491bf9
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