Skip to content
Commit a210d428 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: cc13f9ed -s ours 

am: 4c20c8c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I38ede1e35baec53683c2721013cf52ff8232ff43
parents 60534a8d 4c20c8c1
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