tree 7e54c79d41bc7d0994e78e9245d23b6fd5f8efd6
parent 501dbaea037aa1641baae1bca425c2111fbb9be5
parent 40684946cb00080c1c7424885f49a809816dd26e
author Nick Pelly <npelly@google.com> 1296779549 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296779549 -0800

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

* commit '40684946cb00080c1c7424885f49a809816dd26e':
  Fix docs type that broke build.