tree 73a6170133b46f68155cd7f475f93a03b234157c
parent 938cb839512159fb622f919271d121dfe50332b0
parent 52ba5b08f25e031a6f717551c75abf630b92ed8b
author Jason Sams <rjsams@android.com> 1266002831 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1266002831 -0800

am 52ba5b08: DO NOT MERGE. Update for new RS library with ES 2.0 support.

Merge commit '52ba5b08f25e031a6f717551c75abf630b92ed8b' into eclair-plus-aosp

* commit '52ba5b08f25e031a6f717551c75abf630b92ed8b':
  DO NOT MERGE. Update for new RS library with ES 2.0 support.