Android 4.1.2 release 1
merge in jb-mr0-release history after reset to jb-dev