Skip to content
Commit a832fa89 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: ab6ef4f0 -s ours am: 3633c30c -s ours
am: 358c2af5 -s ours
am skip reason: subject contains skip directive

Change-Id: I662703425358262619b3a117eacda82775abd6a6
parents 292d4c31 358c2af5
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