Skip to content
Commit d851c0d8 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a -s ours am: ae841ab5 -s ours
am: 4e48fd22 -s ours
am skip reason: subject contains skip directive

Change-Id: I57b47245565825365356233e97a5ee70ca874e13
parents b4fe7b07 4e48fd22
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