tree 816616052d805d30621b77b67f23c3839fe20d8d
parent 98c5bd5556f32a237d3483fb7298284869e32a40
parent b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a
author Christopher Tate <ctate@google.com> 1271110567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271110567 -0700

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

Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

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