Skip to content
Commit 1d8da7c2 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: 1feb0dfd -s ours am: 0df74430 -s ours
am: bcc5cadd -s ours
am skip reason: subject contains skip directive

Change-Id: Ieb9563ed8d266bd8cf8853fccd9fcef1fb36b4f6
parents 6b24bafe bcc5cadd
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