diff options
| author | Andreas Huber <andih@google.com> | 2013-06-03 08:46:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 08:46:20 -0700 |
| commit | c41a0eff938f825ef235b92efa7a31c3b7f8bfb4 (patch) | |
| tree | 95e45aed6dda5bce3808b629d99b19cd95f4c66f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 530098327c19cfa3c31c4eabe316bf36ad4a848c (diff) | |
| parent | be22605d1eacfb4137b6984b72a3eda004b911a1 (diff) | |
am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
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