tree d304bee87fc0f85108b2b7dac57844ec1a774a4e
parent 2cec767b8a90fcb913f7689bb20d1fe6f437cced
parent 9a00e8f138b13b551a96104675c93035ea1eface
author Robert Ly <robertly@google.com> 1334259138 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334259138 -0700

am 9a00e8f1: am 070827e6: Merge "docs: fix bug 5158332" into ics-mr1

* commit '9a00e8f138b13b551a96104675c93035ea1eface':
  docs: fix bug 5158332