tree aa92c659e5474b9cfd3c17f2d896cfa72d1ca142
parent 4dcaeb6d776bc87469a97001a223099c8e805579
parent 68c56a51b32b5f5322c4f0f7dbba918712ad6473
author Romain Guy <romainguy@google.com> 1295550019 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295550019 -0800

am 68c56a51: Merge "Documentation fix." into honeycomb

* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
  Documentation fix.