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

Change-Id: I4c801629ef658ea7465660208064ab50fc27201c
parents b019786e 8a201f04
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