Skip to content
Commit c1591ce4 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: 69d1c9c0 -s ours 

am: 2968a449 -s ours
am skip reason: subject contains skip directive

Change-Id: I209140d15b2d2b7183a3dcc4b8ec6351ec26d4c4
parents 796af08a 2968a449
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