Skip to content
Commit 7349bd47 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: b672a3f6 -s ours
am: 47331f14 -s ours
am skip reason: subject contains skip directive

Change-Id: I0d9e8e3e5bf73e1b71afa2d59315010daf139176
parents 733e924a 47331f14
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