Initial AOSP commit
Merge branch 'master' of github.com:jhutson456/android-4.1.2_r1