Skip to content
Commit 8c482c95 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: 2f5007db -s ours 

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

Change-Id: I3b59d13a8876fa21f6ffd1316ca85871835e955d
parents 1f7de702 a44fe677
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