tree 0f4ed357e0a18ab7cf4e24f8068b7ce1cf23637c
parent 821097e5e0f5f00705d81edc6ea66a20c9ebdfa9
parent 0d5aad7edbed3ed5c13904cc13ec8842ffe8837b
author Dianne Hackborn <hackbod@google.com> 1295323234 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295323234 -0800

am 0d5aad7e: Update to follow API.

* commit '0d5aad7edbed3ed5c13904cc13ec8842ffe8837b':
  Update to follow API.