android

Change-Id: I92269ab26d61490d50b141adb047daa8f91740bc
Merge branch 'master' of https://github.com/cw760/rental