OSDN Git Service

am fdc0c861: am b18c7254: am a404a629: am 6fe992d8: am 4fad5c17: Merge "Doc change...
authorDirk Dougherty <ddougherty@google.com>
Sat, 1 Jun 2013 15:32:11 +0000 (08:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Jun 2013 15:32:11 +0000 (08:32 -0700)
commit8ebfb8c9c34caa80cd0d2451d950170c1b522f2a
tree0c0ed41ca85b6362822f33f4ff50d526bc868a7c
parent413adc9260d700bd8143950951c4e1ad07cbeddf
parentfdc0c8618b4e51c322f747202ff94508124e7c9c
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 'fdc0c8618b4e51c322f747202ff94508124e7c9c':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.
core/java/android/content/Intent.java