tree 69095aeaea792d34760e821e61ab967095891919
parent bcde5dbafde7ea419264129e93e38145795c40ef
parent 8db3bd6ec5e242d05488c2c175c90d6b5d535a43
author Andy McFadden <fadden@android.com> 1253730984 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253730984 -0700

am 8db3bd6e: am 9ae00645: Merge change 26280 into eclair

Merge commit '8db3bd6ec5e242d05488c2c175c90d6b5d535a43'

* commit '8db3bd6ec5e242d05488c2c175c90d6b5d535a43':
  Another doc update.