Android 4.1 preview 2
merge in jb-release history after reset to jb-dev