tree c74d4eeb63615c7e5ae19a05897be30772f907a2
parent 1f76f88c3821a1597b2f2884d937c54c2ba08a8e
parent b2473fd65c9030bb81012b07480d9243af7b1a4a
author Dianne Hackborn <hackbod@google.com> 1279081085 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279081085 -0700

am b2473fd6: am 021e906a: Merge "Fix docs build." into gingerbread

Merge commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a'

* commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a':
  Fix docs build.