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

Change-Id: If66285b91e120c64f49e7d39c0093f2d18dd14b2
parents ff1829fd 5924e5ee
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