tree 1a0da3c2dcbcf684e1643d7d9f04fe4ca31eb92c
parent ed8dd73ed08107798ffc861a1497f32976e95f26
parent ab29780cf558101c281cc4839eaa5e0b28269132
author Dianne Hackborn <hackbod@google.com> 1295335938 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295335938 -0800

am ab29780c: am 0d5aad7e: Update to follow API.

* commit 'ab29780cf558101c281cc4839eaa5e0b28269132':
  Update to follow API.