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

Change-Id: I6b99f1b3bc208d28ff1c7476b120132da592c95c
parents 33e684bc 41751064
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