Skip to content
Commit 8f313c04 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: ed1acb11 -s ours
am: 876e21a3 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c13e161d7ead3b8f8e5da180b0fcb19582288e5
parents 65159392 876e21a3
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