Skip to content
Commit b7e65c47 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: 2f5007db -s ours 

am: 7fd9a81f -s ours
am skip reason: subject contains skip directive

Change-Id: Iac2d679d1b1a2bdc24fbf5d0829b6bd45030b7bc
parents 1f7de702 7fd9a81f
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