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

Conflicts:
	iR/ids/ODU2NzA3NTM=