diff options
| author | Anton Hansson <hansson@google.com> | 2020-08-18 12:37:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 12:37:48 +0000 |
| commit | e92740ab3ab6ed8c2b5d5d329e594a4ea7427010 (patch) | |
| tree | b17c92471d78c20340464966496584f142381709 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 45fb6fe0a078e952595d8c89798b1a648cb07e5b (diff) | |
| parent | 9637c20fdcc9454d6501eb306db1bebfa62ddfdd (diff) | |
[automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff0042 am: 2b86731b42 -s ours am: 69acf25884 -s ours am: b5972dfa09 -s ours am: 9637c20fdc -s ours
am skip reason: Change-Id I498823de7315f78121975d36d6dc7667a8245085 with SHA-1 12a07676ed is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402650
Change-Id: Ida63e08106dd5cbf1c4675256768e068e65c2912
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions