Skip to content
Commit 4b5e5899 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: 5e0da71b -s ours 

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

Change-Id: If648ed746648429139bce663ae9279c5e3c913e1
parents c04f152b 61476267
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