tree 2c87acaf8ecf77dbdd6963bb395f53e874d853d2
parent ec82a7bde5970b76f2940db25e35865a23c6ebc2
parent 8ebfb8c9c34caa80cd0d2451d950170c1b522f2a
author Dirk Dougherty <ddougherty@google.com> 1370100913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370100913 -0700

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 '8ebfb8c9c34caa80cd0d2451d950170c1b522f2a':
  Doc change: restore warning not to abort NEW_OUTGOING_CALL.