Skip to content
Commit cea1870b 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421f -s ours am: 32cc5ed3 -s ours am: fa110bea -s ours
am: f92250ba -s ours
am skip reason: subject contains skip directive

Change-Id: Iffa16dea135edb7ce7b763571b6abf676eba58f5
parents c805741b f92250ba
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