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