Skip to content
Commit 8263c868 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: 6b539282 -s ours 

am: f32bcf72 -s ours
am skip reason: subject contains skip directive

Change-Id: I1874b6ccb4ce4957e55573e3aca9bc65dd904c19
parents 43eb7fd5 f32bcf72
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