init commit with hw android
solve gitingore file conflict