Skip to content
Commit 97af5f02 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: b7ad07ad -s ours
am: c5890d03 -s ours
am skip reason: subject contains skip directive

Change-Id: I8b62e7edebfa088b2325f5e392f993070dd7a94c
parents ca9ef128 c5890d03
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