diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-01 14:29:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 14:29:35 -0800 |
| commit | 29c40abf9eaa6ed5af6100616cf9cf91a47bc477 (patch) | |
| tree | 6bfc4ab3faa41c88d2aab263b73b42ce7055a25c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd655c53cd97b83b1d86f3c5bb38666392feea26 (diff) | |
| parent | 18e9a79f2a6f1f2e85499f6713f63b091197130b (diff) | |
am 18e9a79f: am 120f7eb5: am e929e661: Merge "Doc change: Remove proto scheme from src urls (fix mixed content warning)." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '18e9a79f2a6f1f2e85499f6713f63b091197130b':
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