tree 6ab9a3a8b3a574f00a9160826e4a35b078839b66
parent c1cd624b3a4c0528ea386a12f20b6049f12c3858
parent fac84b561193a62b3e9bc7a50b8948a6356be92c
author Xavier Ducrohet <xav@android.com> 1260891744 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260891744 -0800

am fac84b56: Merge change Icb5cf14e into eclair

Merge commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c' into eclair-plus-aosp

* commit 'fac84b561193a62b3e9bc7a50b8948a6356be92c':
  Add feature list support to DroidDoc.