tree 74e8001ad65b16082c7c85cc9482e48b2e06c335
parent 618ded26c61afbf907e72b4568a4f4f1c6c287a7
parent 2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5
author Dirk Dougherty <ddougherty@google.com> 1251945122 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251945122 -0700

am 2a2058f5: Merge change 23762 into donut

Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair

* commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
  Add updated API diff based on 4.xml.