tree b46e7d712d9a1ed3cb732ff21eb3723aabe60111
parent d51a5d7d69098fa41fbdd4fbe0c14ce72d8c25c4
parent 2d258298e2fec670908c69e38c5a3a05b1f3d0f0
author Scott Main <smain@google.com> 1297190133 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297190133 -0800

am 2d258298: am 96764812: cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/

* commit '2d258298e2fec670908c69e38c5a3a05b1f3d0f0':
  cherrypick Change-Id: I3c2a7ea731d2fc3c0e2372e2f1a06ed659a6539f docs: move the SIP guide into guide/network/