Skip to content
Commit d230d40f 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: fe2d421f -s ours 

am: 5c0d577d -s ours
am skip reason: subject contains skip directive

Change-Id: I44ae5fd2adbf9fec717a65c193cb934b0800d3b9
parents f8141159 5c0d577d
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