Skip to content
Commit 469e8cb5 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: e6283fda -s ours
am: aae5671b -s ours
am skip reason: subject contains skip directive

Change-Id: Ie3c87a4dc93d6b54f90672b93f6096c6023a02a7
parents 4b8e648d aae5671b
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