Skip to content
Commit f15a2dd3 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: 9ea1842c -s ours 

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

Change-Id: If7826230f6c7152de69141e4072337419075d1da
parents efb53ead 5e26e1d8
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