dialog layout
dialog layout
fucking conflicts
Merge branch 'master' of https://github.com/wangfowen/hellaroadtrip-android