[automerger skipped] Merge "Change the icon for the captive portal login app."...
[automerger skipped] Merge "Change the icon for the captive portal login app." into qt-dev am: 52801c24 -s ours
am: 91c0efcd -s ours
am skip reason: change_id I378fdb2d493fb8598c3e4fa98e100696c72f88ea with SHA1 f4b136a7 is in history
Change-Id: Idfab0960ea867bcf56646bbaa29de8f0ba91fae0