Skip to content
Commit 933d3e1c authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 64f417f0 -s ours
am: 7cc4ae5a -s ours
am skip reason: subject contains skip directive

Change-Id: I813cdbe3ac946133b36962e75b473f71115ee524
parents 54f726cc 7cc4ae5a
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