Skip to content
Commit 7cc4ae5a 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-qpr1-dev 

am: 64f417f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I5449b787f5bd1468b7ec423407a4c34338949bc1
parents de264426 64f417f0
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