Skip to content
Commit 61d4c3e1 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: b8631923 -s ours
am: 018e4cab -s ours
am skip reason: subject contains skip directive

Change-Id: I504073395d6038c42eb8ee65fa3231366252ce02
parents c10e3ab6 018e4cab
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