Making build happy.
Merge branch 'gingerbread' of https://github.com/CMOptimus/android_frameworks_base into gingerbread