Skip to content
Commit e372602e 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 2c14f3f9 -s ours
am: d0680538 -s ours
am skip reason: subject contains skip directive

Change-Id: If09c6154f34480342999bdb88f96934bb2334b08
parents d0097c6e d0680538
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