Skip to content
Commit 2a7d6323 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: 7545f42d -s ours
am skip reason: subject contains skip directive

Change-Id: I56b3115f0c379c8f5ad12c604e41a87cebbfd667
parents 547b7b71 7545f42d
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