Skip to content
Commit bcc5cadd 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: 1feb0dfd -s ours 

am: 0df74430 -s ours
am skip reason: subject contains skip directive

Change-Id: I145c27b3f368aafdb735333bbcde9ffab79c6c2b
parents b3e35759 0df74430
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