diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-06 02:14:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-06 02:14:12 +0000 |
| commit | 6e9cf8d8fde8feecf8d316eafca48d7e3ae616f7 (patch) | |
| tree | 85da1f5a942d327e791b4526e99f04a8dd19bfe9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 142129854eeedf96ecacef7a4fa41833253a6c7a (diff) | |
| parent | 3cf0c7a19533ad897bdecef918fee0b09cce87bf (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
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions