Skip to content
Commit 75f383fa 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: c0004871 -s ours 

am: 453efcb3 -s ours
am skip reason: subject contains skip directive

Change-Id: I4fc34749c532d0d261089b697e87267fadb16765
parents c9f3d2d6 453efcb3
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