summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-07-15 12:31:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-15 12:31:29 -0700
commit9db328463a61357a3928ef2012c209bd5e7b09e1 (patch)
tree811f504c07a20cc110781680feb49ed72ed7259d /graphics/java/android/renderscript/RenderScript.java
parent3864d243a91474c6c410969944d99e379a1da121 (diff)
parent203ec9fa6eab21621969f36053d4cd59c23977a9 (diff)
am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9' * commit '203ec9fa6eab21621969f36053d4cd59c23977a9': Interface support for custom HTTP headers in DL manager
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions