Commit
commit
Merge branch 'master' of https://github.com/TitoAlfaro/ProximitySensing

Conflicts:
	gen/android/support/v7/appcompat/R.java