Skip to content
Commit 08cd4437 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: b37de731 -s ours 

am: 2fcb4538 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib07ebc6167b6c78708c6bc1a332081b9154a01c1
parents fd01f3c9 2fcb4538
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