tree 9626da22db24e6eb13e7745aa0ff2bee47709c97
parent 19840a8d40139a12469ef92c3541f2a433d5ae85
parent 3af7b848143bef17230674bbed79ca77d3527e8e
author kmccormick <kmccormick@google.com> 1364435950 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364435950 -0700

am 3af7b848: am 821d4943: Merge "Doc update: use parse, not new" into jb-mr1.1-docs

* commit '3af7b848143bef17230674bbed79ca77d3527e8e':
  Doc update: use parse, not new