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

Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base