diff options
author | Elliot Waite <elliotwaite@google.com> | 2016-12-06 02:19:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 02:19:05 +0000 |
commit | d92c40f0ea76cd981904218d3442db0447e6d2ab (patch) | |
tree | df9ce03ea53443eec60c52592993e4a636ac2881 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 11f92ccf83baaec5f810cb15123e8c8264ec99dd (diff) | |
parent | bc6aff401322df81a0709cafa8d834d5e1f52954 (diff) |
Merge "Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 634f858088" into nyc-mr2-dev-plus-aosp
am: bc6aff4013
Change-Id: Iee9c6f92fd7cd0853e102c38495e998f3f552200
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions