Skip to content
Commit c27000f3 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 83b7531e -s ours
am: 5621f5b1 -s ours
am skip reason: subject contains skip directive

Change-Id: I4047a58114feddd8a0e97bc7336d15228fd6bf33
parents ec904a73 5621f5b1
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