looks like I missed a }
Merge branch 'jb2' of https://github.com/CarbonDev/android_frameworks_base into jb2