am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and...
am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '7fef3c57' into kraken
* commit '7fef3c57':
API CHANGE: remove obsolete constants and hide some methods