am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo

Merge commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken

* commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da':
  API CHANGE: remove obsolete constants and hide some methods