summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Dirk Dougherty <ddougherty@google.com> 2010-05-10 09:49:37 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-10 09:49:37 -0700
commit31e4f45ebacdb034cecd42c06c6cf3cf39342f2d (patch)
treea29e0570bce3dbfb4ac2c04afe44beccfe2c5313 /libs/rs/rsScript.cpp
parent25d2406176aff9d53b7e0f975c6839e5e701a367 (diff)
parente4682e8ae75d573c12ddabce13b8b5c39011a86f (diff)
am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken * commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f': Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions