Skip to content
Commit dc8467d2 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-dev 

am: 465f347c -s ours
am skip reason: subject contains skip directive

Change-Id: I0f7a43e64309d3ce82a06bed01a44f3aa01af4f9
parents b7098f9d 465f347c
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