tree c10b50b14cbbe210d2c663b9af77abc16dc7f4a1
parent 622da6829f11f0cacdbd6fe3b58f230d98115ed5
parent b6b25d63df8dd873c60ab056e5b0e0eda167cfb1
author Scott Main <smain@google.com> 1251948102 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1251948102 -0700

am b6b25d63: Merge change 23126 into donut

Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair

* commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1':
  docs only.