Skip to content
Commit e62a7cc3 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: 5c0d577d -s ours am: d230d40f -s ours
am: 43dcada4 -s ours
am skip reason: subject contains skip directive

Change-Id: I40f54967d7f83b69483fd4c37c2012dc2d744235
parents ced64357 43dcada4
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