Skip to content
Commit 2e78f06f 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: 3b7a08e3 -s ours 

am: 843ab671 -s ours
am skip reason: subject contains skip directive

Change-Id: I3dd4e0697ae55fd9b95a471cdb2d64ca4f8d3d10
parents b6079281 843ab671
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