tree cc06c9d7b872eddafe9423c1c455f6cd10f19cda
parent e64253fbcaa1a8eae4dc5e3d52e8404f40e853ff
parent b1c453f2897a9bf7dcfe71a84512877c5c6f0536
author kmccormick <kmccormick@google.com> 1364435544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364435544 -0700

am b1c453f2: am 353e7a2f: Merge "Doc Update: bug fix." into jb-mr1.1-docs

* commit 'b1c453f2897a9bf7dcfe71a84512877c5c6f0536':
  Doc Update: bug fix.