tree 3da1d8d0a16d08bae8a68c1b9a23cd5a4a40992c
parent 2a6151f7931166234dd27c8b2923c82ea66be00a
parent dc958e33e59a67ec958a68cb4fbfdd13c1782aab
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.