Skip to content
Commit 94f7f806 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-qpr1-dev 

am: 86dcc8c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I450da3f61f0baaa0fcf5789244793859ce0cf2f0
parents 83500bab 86dcc8c1
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