Merge branch 'master' of https://github.com/g8231226702/mobile_final

Conflicts:

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$layout.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$menu.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$string.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$style.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$styleable.class
d
Allen's

Conflicts:

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$layout.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$menu.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$string.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$style.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$styleable.class