Skip to content
Commit 8237048f 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-r1-dev 

am: 55a53882 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib8e218df033bf2639a89471710f5bdf60a6c5a95
parents 9b653e22 55a53882
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