合并login

Change-Id: Ie06ed019cbb00d52e0b9e1f3c7a56c947b57a42c
88 files changed