Skip to content
Commit 61115d5b 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: 8f1b7c77 -s ours 

am: d4abcd0f -s ours
am skip reason: subject contains skip directive

Change-Id: I9e0669e958eeb40344d4b7a80d7263dd712e466c
parents 1b25e3de d4abcd0f
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