HWASettings jellybean branch to master branch