tree a382a228b14efdc86e4e7abf74ca7f40d6bd01bc
parent 9e7d5f987636846608bf23b0c445242cd1570352
parent d2acfd6d04545562fcacd266e175461f26b25da9
author Robert Ly <robertly@google.com> 1298003029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1298003029 -0800

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

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