tree 296701b10786abc4f4f306ba6662dbcfe5f25186
parent 59e61354801b378c074b85f0dea0da62481298c9
parent 8da20dd03797dcdc1f417fe9cebc21825551dd69
author Dianne Hackborn <hackbod@google.com> 1282957849 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282957849 -0700

am 8da20dd0: am 4f8c2f26: Fix docs build.

Merge commit '8da20dd03797dcdc1f417fe9cebc21825551dd69'

* commit '8da20dd03797dcdc1f417fe9cebc21825551dd69':
  Fix docs build.