summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-04-20 21:36:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-20 21:36:55 -0700
commita5d34593166bf840f45102b9ab6b677e46dfefee (patch)
tree8250838cbb12993a682097642ef12590374b4ffd /graphics/java/android/renderscript/RenderScript.java
parent4c2b007b5e1c617026e3a1926c5c867eff574f73 (diff)
parent7e170b632147da55f93864223419a9f7fa651410 (diff)
am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit '7e170b632147da55f93864223419a9f7fa651410': do not attempt to parcel unknown ParcelableSpans
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions