diff options
author | Victoria Lease <violets@google.com> | 2013-04-20 21:34:52 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-20 21:34:52 -0700 |
commit | 7e170b632147da55f93864223419a9f7fa651410 (patch) | |
tree | 763318e0dc4bd1acfbe750ccd087fd609d36e116 /graphics/java/android/renderscript/RenderScript.java | |
parent | 5b00f5584a7894bb79f9ce369d88cea5d886ff22 (diff) | |
parent | bcf3ec96a46aacba58af62ed963ebf1c812c8179 (diff) |
am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
do not attempt to parcel unknown ParcelableSpans
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions