Skip to content
Commit 68884983 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: 63f2e002 -s ours
am: a3f6f8b4 -s ours
am skip reason: subject contains skip directive

Change-Id: If95a6766c4fc4124c3c266af3e97dfd51c0e82da
parents 16cb9fc1 a3f6f8b4
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