Skip to content
Commit e513d548 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: 7350ab11 -s ours
am: 4b279cd1 -s ours
am skip reason: subject contains skip directive

Change-Id: Id65e68e8e663dce961e8ef370a8a915fa777ee81
parents 7aee9fbb 4b279cd1
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