README.md
Merge https://github.com/Joe-Tech/android_frameworks_base

Conflicts:
	README.md
-a