tree 7a491eda5a84380758e262bc378f9e1f2166d0c3
parent 6ac11a641539dbcd72b342b492a1c2e1de8a22c1
parent e52a1b5909bbae99cd1830cc5375fc02eaf5a747
author Dianne Hackborn <hackbod@google.com> 1254430435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254430435 -0700

am e52a1b59: Follow changed API.

Merge commit 'e52a1b5909bbae99cd1830cc5375fc02eaf5a747'

* commit 'e52a1b5909bbae99cd1830cc5375fc02eaf5a747':
  Follow changed API.