tree 6a612104528ace0ce45af457a56d176c81630c8e
parent 13778accfee34d3cc6d7696e3fd7446de9698edc
parent 15650af4ab1df7fb84839162f9409d88cb4a3ccc
author Trevor Johns <tjohns@google.com> 1260457297 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260457297 -0800

am 15650af4: am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.

Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'

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