tree f870ef423619df811c8f1d8553b158472508244b
parent a8a90c200944d21d7e63f9abd12a6d5248cd7df7
parent ad48769812d41d7765934635b2c4db3860fa35f5
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.