Skip to content
Commit 09b57e28 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: aa0ebd7d -s ours
am: 43ee27f9 -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb9e5ee5fdeba05a050676dd373adc0cd9b60e1
parents 2b4e621a 43ee27f9
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