Skip to content
Commit 7340a2f7 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: e4227efa -s ours
am skip reason: subject contains skip directive

Change-Id: If4895c2f930e1c50c61e0e02fb26c200f693e0dd
parents 62b7c9e7 e4227efa
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