diff options
| author | Chenbo Feng <fengc@google.com> | 2019-05-29 19:53:00 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-29 19:53:00 -0700 |
| commit | 590e191ab5ffb6e85f38d0723f38a5cfb2cc1bb2 (patch) | |
| tree | a94d690a6adf2e8961b55ba3c1490c2aef05a96e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c0274d1315ff00d3882e304706588d55aa3e6468 (diff) | |
| parent | 431102217093785ae7e2174680d250ae52ebce87 (diff) | |
[automerger skipped] Merge "Add server information for pptp vpn" into qt-dev
am: 4311022170 -s ours
am skip reason: change_id Ia6b00dd88f8f31823647c56c20b8c7edd20280f7 with SHA1 b38065dd3a is in history
Change-Id: I88245117b4c90de8faa3d7976213249eaa73b9d4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions