Skip to content
Commit 4912fe90 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: 0571fa82 -s ours
am skip reason: subject contains skip directive

Change-Id: I5d259afe54bb4204d38836ba68ffaa5743b4b67d
parents 9c9c03ac 0571fa82
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