diff options
| author | Elliot Waite <elliotwaite@google.com> | 2016-12-06 02:20:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 02:20:50 +0000 |
| commit | ee5d35744c43132d9a4fddc38592f03427795768 (patch) | |
| tree | df9ce03ea53443eec60c52592993e4a636ac2881 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a12350650a943979cacf55091266b41bd9ad9068 (diff) | |
| parent | 142129854eeedf96ecacef7a4fa41833253a6c7a (diff) | |
Merge "Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7 am: 5a701867d5 am: d41497de6c" into nyc-mr2-dev-plus-aosp
am: 142129854e
Change-Id: Id8fea1bf0acaa53162205dfc586224f17957ffe5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions