diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-08-27 16:16:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-27 16:16:55 +0000 |
| commit | 1794dd8b7db8fd2cfd83d88011e083a2390bfc8f (patch) | |
| tree | 1368a2a84ae5b3dc61a8a0e75f23efa678cc73ce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 20ce284f542f6bf41548e92715f1d7c9d4afbdf4 (diff) | |
| parent | 76428e01565997f21b6a50bd82088b11f7a1ac15 (diff) | |
am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs
* commit '76428e01565997f21b6a50bd82088b11f7a1ac15':
docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions