diff options
| author | Elliot Waite <elliotwaite@google.com> | 2016-12-06 02:22:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 02:22:45 +0000 |
| commit | 6f1c9a4cc376a2f49feefb3b22afe984985d035b (patch) | |
| tree | df9ce03ea53443eec60c52592993e4a636ac2881 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 260cb6a65a5d297d047a83dea5e4ff50c688ad5f (diff) | |
| parent | 6e9cf8d8fde8feecf8d316eafca48d7e3ae616f7 (diff) | |
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: 38e1cc9790" into nyc-mr2-dev-plus-aosp
am: 6e9cf8d8fd
Change-Id: I1af9eb203432b2137544598be5ebbe5d34709ab5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions