diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-02-08 11:16:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-08 11:16:11 -0800 |
| commit | 9b8b4ae5d7a4f5fbe242f5a2da145fd0fa88ce87 (patch) | |
| tree | 2331df7422146105446ddd360b728be3cb271150 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 11fa446033a8600b681efeb857507388e8113d72 (diff) | |
| parent | f2d89ef9d57b096962b802608a88d3483a51d08a (diff) | |
am f2d89ef9: am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit 'f2d89ef9d57b096962b802608a88d3483a51d08a':
Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions