Skip to content
Commit e14534cc 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: 83b7531e -s ours
am: 756381bb -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa83c397172bfff8895d53677ee95611ad92eab5
parents f9b86868 756381bb
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