Skip to content
Commit 6c765a1e 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: 3390e7b7 -s ours
am skip reason: subject contains skip directive

Change-Id: I31be8b2d67b52dcf6d62dfcc98632364db470e02
parents 25fb683f 3390e7b7
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