diff options
author | George Mount <mount@google.com> | 2014-08-29 03:12:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 03:12:00 +0000 |
commit | 3a44b3f8897f898201039b636ccaac3e015590cf (patch) | |
tree | 7b63fd4909f353d04761c54dda6a078f16d0c6ec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c1cdf5dc3c108c0fdc9e9b7429943b00bddd77c9 (diff) | |
parent | 7b7499644ce99a4fdf5d9a8693c2bbafc98c354b (diff) |
am f16343b7: am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev
* commit 'f16343b723656315cc51b9e3acb4c43d2263487e':
Fix NPE when transitioning on unattached scene root.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions