Skip to content
Commit b4fe7b07 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: bde6a92a -s ours am: 9a259d5d -s ours
am: 167cb383 -s ours
am skip reason: subject contains skip directive

Change-Id: Idddff624b8f352cef74b0281b8a35cc60c6fb5e6
parents cc814f77 167cb383
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