First commit from mbpr.
Merge https://github.com/Jajoba/Android