OSDN Git Service

am 0f70bcfc: am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am...
authorDirk Dougherty <ddougherty@google.com>
Sat, 1 Jun 2013 16:52:14 +0000 (09:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Jun 2013 16:52:14 +0000 (09:52 -0700)
commiteb47aac14c584bb7326f48082b37cb0e0d0b500f
tree9a265562d8fede52d75e7c0d326542faf1c559ba
parent61b7e872bf043a1a23d847ada7063e6fdcf6ddad
parent0f70bcfce3eb291e95e2a70f9d353efa862796da
am 0f70bcfc: am 8ebfb8c9: am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change: restore warning not to abort NEW_OUTGOING_CALL." into jb-mr1.1-docs

* commit '0f70bcfce3eb291e95e2a70f9d353efa862796da':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
core/java/android/content/Intent.java