Merge pull request #12 from CyanogenMod/cm-11.0

Update to upstream