SDFDF
Merge branch 'master' of https://github.com/jjyo/android

Conflicts:
	iR/ids/OTM1MTIzMTky