tree 7cce143e1537810a60c144e7b14407b281bb7670
parent 43429036f5885063e522603e51c5f59f8b9e697a
parent 021e906a46f044025ce0a4632309abecd069240d
author Dianne Hackborn <hackbod@google.com> 1279080887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279080887 -0700

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

Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp

* commit '021e906a46f044025ce0a4632309abecd069240d':
  Fix docs build.