diff options
| author | Stephen Hines <srhines@google.com> | 2013-12-18 16:32:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-18 16:32:59 -0800 |
| commit | ad5ee2f40a1b248aea49657e9f7155daac4cf65e (patch) | |
| tree | 3b5454e660b4e891f32f043406edca74f7843a80 /rs/java/android/renderscript/ProgramStore.java | |
| parent | be8fbb8fb63fddac2310dfbafa2594ed165b16b1 (diff) | |
| parent | 7f8c70a1a48df91ee5541b03dc380c08ab6ebf42 (diff) | |
am 7f8c70a1: (-s ours) Merge "DO NOT MERGE - Fix improper declaration/use of pointer."
* commit '7f8c70a1a48df91ee5541b03dc380c08ab6ebf42':
DO NOT MERGE - Fix improper declaration/use of pointer.
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions