tree c3593a092dce6c5661a3dc5a607c046b96d772af
parent 81f4f8d0f9edf285ec371c58ec1053cc6e1ed856
parent 4fd70373ecafbf5a87a1c35852aec2818612e928
author Jason Sams <rjsams@android.com> 1297205855 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297205855 -0800

am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb

* commit '4fd70373ecafbf5a87a1c35852aec2818612e928':
  Fix bug 3421901 remove 2 functions from public headers in the SDK.