diff options
| author | Frank Li <lifr@google.com> | 2019-07-25 21:17:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 21:17:41 -0700 |
| commit | 18da5d7e1e11b615ff261041406d19f0a4256585 (patch) | |
| tree | 8e3cbc18c6eaa9f2b33f685019362bc4e22b3967 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ef96bdc6bac39f20cbd391902b6ba67acb0a4cd0 (diff) | |
| parent | e22c237438ed3b88dfa1b75f177cf1ed742e5c09 (diff) | |
Merge "[automerger skipped] Merge changes from topic "DNS telemetry" into qt-r1-dev am: 412c59128e -s ours
am: e22c237438 -s ours
am skip reason: change_id Iab542b32a8a18ae0bdbd8e005c430a876f056806 with SHA1 60d4f1a5bd is in history
Change-Id: I8c7a3acd5077d2991376145cd515324274ac7f9f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions