diff options
| author | satayev <satayev@google.com> | 2021-01-21 15:59:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-21 15:59:13 +0000 |
| commit | 15f17656fd9595cb572ca975e602e506c64f8538 (patch) | |
| tree | 32c15181ca71882b059298e39e27ce9425dd6a50 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0a5c88486a99cfea968ccea16f4010f02a878fa8 (diff) | |
| parent | 7c54084978632a3f8dc7dc8e3840b8ebfdda275e (diff) | |
[automerger skipped] Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab am: 7c54084978 -s ours
am skip reason: Change-Id I8dd3bbacdb263a3e30539f43d8081f6d78e80155 with SHA-1 6609105eb5 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546085
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0a6de6d964b892f492ee70998b09ab6eb9cef326
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions