diff options
| author | Frank Li <lifr@google.com> | 2019-07-25 20:50:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 20:50:39 -0700 |
| commit | 0c150a9917f2aee44a6f7cfc9b8a7253094dc666 (patch) | |
| tree | 67270e2872efe762e7c33b37a3af93adfe5e1925 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ce7226df531446d7e3ef9b5b64d2e94d45399a29 (diff) | |
| parent | 412c59128e5bca47cfb59eca82d57f5b84400579 (diff) | |
[automerger skipped] Merge changes from topic "DNS telemetry" into qt-r1-dev
am: 412c59128e -s ours
am skip reason: change_id Iab542b32a8a18ae0bdbd8e005c430a876f056806 with SHA1 60d4f1a5bd is in history
Change-Id: Ife19bafaaf3e6f582f269af1d69d945814f5091a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions