diff options
| author | Robert Carr <racarr@google.com> | 2019-05-08 12:11:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 12:11:33 -0700 |
| commit | 3d8f771d95897ef9df827ba2e953361ffd3a188d (patch) | |
| tree | 741ab493b63333d7af8edfc0e2711bb58b2ed3d8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c8cb13a5378ad070b9f32df9bb979392af5e714f (diff) | |
| parent | 6265a0fc50205d63fef6958fd1c1a643ed444e09 (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: Exclude secure layers from most screenshots taken by the system server." into pi-dev
am: 6265a0fc50 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie0051f57f871f5312a9ed05943481a383139f3ea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions