tree dec407e1c7e510f59b90d645c92e0baadecc1043
parent a9c369d0fbe2b995f456877b2368aac95f810558
parent 062443f2956bb85ef84485a62e9b0496fded68ae
author Nick Pelly <npelly@google.com> 1296779712 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296779712 -0800

am 062443f2: am 40684946: Merge "Fix docs type that broke build." into gingerbread

* commit '062443f2956bb85ef84485a62e9b0496fded68ae':
  Fix docs type that broke build.