use same branch as rest of project
Merge pull request #1 from CyanogenMod/master

use same branch as rest of project