diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-01 14:26:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 14:26:01 -0800 |
| commit | 18e9a79f2a6f1f2e85499f6713f63b091197130b (patch) | |
| tree | 8922613e2f717fd9e013679cfbcc8b54c6a64e79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7d47fbf346a31c07a403bf6898220e7e4045ed34 (diff) | |
| parent | 120f7eb5e25ce884c30454ae9ad56b1e2c3de101 (diff) | |
am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '120f7eb5e25ce884c30454ae9ad56b1e2c3de101':
Doc change: Remove proto scheme from src urls (fix mixed content warning).
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions