Skip to content
Commit 95a636d3 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b37de731 -s ours am: 2fcb4538 -s ours
am: 08cd4437 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2f5ee5265ee7ad21c9aaf479aed0cbbe446d77a
parents a38e0b6f 08cd4437
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