diff options
| author | Mark Chien <markchien@google.com> | 2019-05-30 02:19:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-30 02:19:36 -0700 |
| commit | 83a528fbf2476ea8a69b3fd29ad0c636356285f5 (patch) | |
| tree | c08d97c258d2e7f866c4741b6a05df9d74e89db6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aa88c421278f6977e8d513841fe0d7444ec1971b (diff) | |
| parent | 709c46a60a430af20c5232f36a02c87ea70b616f (diff) | |
[automerger skipped] Merge "Fix captive portal can't show certificate problem" into qt-dev
am: 709c46a60a -s ours
am skip reason: change_id I64b05adcb46baf3fca116dbdc5177bc31c71e06d with SHA1 c0274d1315 is in history
Change-Id: I8b637490b79bc202530e095644ad7e23c434e59f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions