tree 5da2aa90635db6c0e2801e1b25a2c09a68355856
parent f8648cd437d47b0f3c7d404cb87582dba458e6c4
parent 346c507f0be9b40d77f656fd5a548ba7bba1f342
author Adam Powell <adamp@google.com> 1284760585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284760585 -0700

am 346c507f: Merge "Updated for framework API changes" into gingerbread

Merge commit '346c507f0be9b40d77f656fd5a548ba7bba1f342' into gingerbread-plus-aosp

* commit '346c507f0be9b40d77f656fd5a548ba7bba1f342':
  Updated for framework API changes