Skip to content
Commit 271c9508 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: 25a43f36 -s ours 

am: e325be79 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b2ce7acd4397e90fae196770a3ac4bfe3b95eda
parents 96fdf004 e325be79
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