tree 69d1f4e49e6fb37758cdb49356705c1b7218bbd6
parent 6545804c4bf30ea13ec0d8c23bbbe48a6aaac3e8
parent fe0778849802331a68fbe7fa194d0f50b25527f8
author Trevor Johns <tjohns@google.com> 1260254566 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260254566 -0800

am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.

Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent