tree 9bce2ca1100cf6bf91fda4d588efaed739e6a31a
parent 305efe23a326d0f886d3cf66ea05dfbd30e714e2
parent 00ac55ed8b56721536eedf509ea754f4f3737d98
author Katie McCormick <kmccormick@google.com> 1357350668 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357350668 -0800

am 00ac55ed: am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip

* commit '00ac55ed8b56721536eedf509ea754f4f3737d98':
  Doc update: fixed manifest typo in Network zip