Skip to content
Commit 741b1e63 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: f5b1101a -s ours
am: 3bef14d1 -s ours
am skip reason: subject contains skip directive

Change-Id: I367a9a7ed5ea28ee5de6c344a9dd539033e06242
parents c90f257a 3bef14d1
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