tree acc5b3fd44b5e51d3bcbacd91855189005dc6ab1
parent df4cf29715146d67306595108c565d9848a6ae1a
parent 528954c4d63980c0515528624130477f921cbc60
author Scott Main <smain@google.com> 1253045914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253045914 -0700

am 528954c4: docs only. fix sample code errors per bug 2115299

Merge commit '528954c4d63980c0515528624130477f921cbc60' into eclair

* commit '528954c4d63980c0515528624130477f921cbc60':
  docs only.