Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp * commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a': API CHANGE: remove obsolete constants and hide some methods
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp * commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a': API CHANGE: remove obsolete constants and hide some methods