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

Change-Id: I326caa45bd9e159ba6a41a9276b06b16bc5f6014
parents b7a7015e c760a652
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