tree 1a3ab733b3336b063e50e1834841dc597f4cb9c4
parent 754204037234c2dbef8306df0066cb4edbf2a41c
parent 928d2634ff9084ffc9d041b06fd7945cd8463801
author Katie McCormick <kmccormick@google.com> 1357346208 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357346208 -0800

am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip

* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
  Doc update: fixed manifest typo in Network zip