summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/Script.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-25 17:23:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-25 17:23:10 -0700
commitf0b3fa60dba67e904a2336980ecbb937d32b2387 (patch)
tree0dc0cb968ddeefaa33c18c466cb6264706c0695d /graphics/java/android/renderscript/Script.java
parent41d21efd61157c9a4c49b2f7a6580ae0cbb58397 (diff)
parent3d40cd5055a8b507877e10bfb81b3ae35a2602a4 (diff)
am 3d40cd50: am c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp * commit '3d40cd5055a8b507877e10bfb81b3ae35a2602a4': update featured videos
Diffstat (limited to 'graphics/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions