diff options
| author | Andreas Huber <andih@google.com> | 2013-06-03 08:48:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 08:48:30 -0700 |
| commit | 4a02d4c60946c257ab48783493db67ca08e327bc (patch) | |
| tree | c98c79c04625a9e6f669a4d643f2e9c326a4b4bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 293665686e45ae7c969a51de9fe9c9b32604782f (diff) | |
| parent | c41a0eff938f825ef235b92efa7a31c3b7f8bfb4 (diff) | |
am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4':
Listen for HTTP proxy changes and propagate the information to the media
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions