tree 40710f28be3cfa8bcd8c2db1f9323345cd612567
parent aa680857e6ba107dfc9c76c5a342f6f907120c22
parent a58f58daf94caa7e50c04707a67ba1a9dacb0a9c
author Robert Ly <robertly@google.com> 1298002895 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298002895 -0800

am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb

* commit 'a58f58daf94caa7e50c04707a67ba1a9dacb0a9c':
  Doc change: fixing renderscript samples