tree 79c5291fb8cd1481db774e672012462d870b068c
parent 062d6d51f26d57b76bdaed940efd90184e6d0cb6
parent b962b98bef33eba634aec41cf9d84527ce9db3bb
author Robert Ly <robertly@google.com> 1330708314 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330708314 -0800

am b962b98b: am 67a15457: am e5e11fd6: Merge "docs: fixing bug 5942573" into ics-mr1

* commit 'b962b98bef33eba634aec41cf9d84527ce9db3bb':
  docs: fixing bug 5942573