Skip to content
Commit 1edbffee 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: 4b4b0263 -s ours 

am: 4f6b3433 -s ours
am skip reason: subject contains skip directive

Change-Id: I77331eb6ff8f5c79c098bd50f34256e1af1ad601
parents 684f973b 4f6b3433
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