Skip to content
Commit 6eafacb8 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: 4ffaa9a2 -s ours 

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

Change-Id: I5860e36942041c1d6070c0c7b84dc2b8a3b2ee5a
parents a210d428 c185e17a
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