tree 86e4e0f7c1ed45244923347d60a9e26a693c2e0b
parent 6ca442684e60032688cc195400c93b0a06e1665d
parent 23094b468d97f9dce539e250dfb8df1aa6bddbbf
author Adam Cohen <adamcohen@google.com> 1295511166 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295511166 -0800

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

* commit '23094b468d97f9dce539e250dfb8df1aa6bddbbf':
  Updating call to match framework.