Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp * commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99': These are not ready to be exposed. Also rename them to be better.
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp * commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99': These are not ready to be exposed. Also rename them to be better.