Skip to content
Commit e69b008c 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: c0004871 -s ours am: 453efcb3 -s ours
am: 75f383fa -s ours
am skip reason: subject contains skip directive

Change-Id: I098c9fe51ade0362c6767987ab08a5d6676d174a
parents f292afc1 75f383fa
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