diff options
| author | Liz Kammer <eakammer@google.com> | 2020-10-19 20:45:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-19 20:45:06 +0000 |
| commit | edd637de8d8aea3802cde35a1367c4f94ea3793a (patch) | |
| tree | 13fdc63672560d3f84d22d08eb98e1d7c542e41d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e2a8a56e2332460d5bd6c99329ccb7766c76ec69 (diff) | |
| parent | 32fefc24217f758e14c4097cb425ff2a015a8c62 (diff) | |
[automerger skipped] Merge "Make framework-res dep in stubs explicit am: 47994f3743" into mainline-prod am: 32fefc2421 -s ours
am skip reason: Change-Id I1829789af207cc45c49c0c68369fc7c0c085bcb0 with SHA-1 47994f3743 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12846973
Change-Id: I146969cdbe15bd3b36d701c8e9d0ca3bc47c8e9e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions