Skip to content
Commit b5a14629 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: 55a53882 -s ours
am: 8237048f -s ours
am skip reason: subject contains skip directive

Change-Id: I01bd7e707b7758d8221db45dd341f0b3745947df
parents bc9d86ab 8237048f
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