diff options
| author | Evan Charlton <evanc@google.com> | 2014-06-04 17:02:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 17:02:10 +0000 |
| commit | 065ec0f7aeb73765ccd0bd894a717d2ce97d0689 (patch) | |
| tree | a310f2b61f53e0a604f4c2f4460ed900770e547c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2fabda19067e41f04d526bf7a7ac754ddc7c7345 (diff) | |
| parent | faa3ff9ba89486aad83eab0526aea46ea7bbcfe6 (diff) | |
am 44f3a86a: (-s ours) Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
* commit '44f3a86a67fc46065c1d17c1048694e880b87b30':
Revert sendEnvelope changes [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions