tree 1c946a5414369e20553a9166f3b8535dcacf3299
parent dc9555fb64b3fe53a06e7eabbf4a31018b9ee1ac
parent c2d3fc2cc1db63e7bb9421878f2959a3936325a9
author Scott Main <smain@google.com> 1252608001 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252608001 -0700

am c2d3fc2c: Merge change 22323 into donut

Merge commit 'c2d3fc2cc1db63e7bb9421878f2959a3936325a9' into eclair

* commit 'c2d3fc2cc1db63e7bb9421878f2959a3936325a9':
  docs only.