OSDN Git Service

am 2a2058f5: Merge change 23762 into donut
authorDirk Dougherty <ddougherty@google.com>
Thu, 3 Sep 2009 02:32:02 +0000 (19:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Sep 2009 02:32:02 +0000 (19:32 -0700)
commit69c41b3f146e05ff655f981d7c7fd1b1e54f4dde
treea8d8b2ab486ed3d83536a4633547caaeb1a4a626
parentc7f3cc9c3bcf7103baa5cff230f06e533359ebb1
parentef8cb0d852d24d657e98c396befd6036d5cc262d
am 2a2058f5: Merge change 23762 into donut

Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair

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