tree a08b755263ff6879330f1d3645a1419d6d60d858
parent 32c88ecdc696c7306b1c565ffd74d791c7943abd
parent 378fc245b35961adacf98bac41ae080b30cb4418
author Adam Cohen <adamcohen@google.com> 1295511063 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295511063 -0800

am 378fc245: Merge "Updating call to match framework." into honeycomb

* commit '378fc245b35961adacf98bac41ae080b30cb4418':
  Updating call to match framework.