Skip to content
Commit f92250ba 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 skip reason: subject contains skip directive

Change-Id: Iad9b473268b8e4c40c637ef02dacfd14e77bde28
parents 3df86ce4 fa110bea
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