Skip to content
Commit cda3e162 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: 80bbe491 -s ours am: 8cf0a06f -s ours
am: 56ab84ad -s ours
am skip reason: subject contains skip directive

Change-Id: I5d079f6a3a52d14db5ffccd8bfa73f9f309046d6
parents 569b66ff 56ab84ad
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