Skip to content
Commit 369c100c authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: be592d32 -s ours
am: 9d86289f -s ours
am skip reason: subject contains skip directive

Change-Id: Iff17ae62fb8ee79c22f6959554b9a45d81eed4c7
parents 09b57e28 9d86289f
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