tree ac5d198eb395c7cf78effe38921c62c839aa4fc7
parent 5a3d6cc188bd38a9475c801a13f7752b24fb1072
parent 4ffdca06ec5575ddaa215941c1cc21de96e76bcb
author Jeff Brown <jeffbrown@google.com> 1299728269 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299728269 -0800

am 4ffdca06: am 3de30a4c: Update API.

* commit '4ffdca06ec5575ddaa215941c1cc21de96e76bcb':
  Update API.