Skip to content
Commit fec7ec94 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: 2d016d1b -s ours
am skip reason: subject contains skip directive

Change-Id: Ib968fc1ed15f505f423d3f9086270e39454a1b80
parents 14758b23 2d016d1b
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