tree 75b0c3f035098e717d73583667f12c6084f236a6
parent 05db19bc55962374812775bf7d980d83ca4f6c3e
parent 64e4ed8d67376e519c2d0d5e70a1375f8a8760eb
author Robert Ly <robertly@google.com> 1354223063 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354223063 -0800

am 64e4ed8d: Merge "docs: fix bug 7628699" into jb-mr1-dev

* commit '64e4ed8d67376e519c2d0d5e70a1375f8a8760eb':
  docs: fix bug 7628699