Skip to content
Commit a6d9bffb 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: 5e0da71b -s ours
am skip reason: subject contains skip directive

Change-Id: I3f61ddafc544e090c8cdf468c143c2470891c728
parents f57a060a 5e0da71b
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