asdas

dasdasda
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/dex-cache/cache.xml
Merge branch 'richard-test'
Merge branch 'master' of https://github.com/spancharpula/Inspections1
finishedsql

sqllasldkasd
Merge branch 'master' into shashank-test