diff options
| author | Anton Hansson <hansson@google.com> | 2020-08-18 12:16:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-18 12:16:23 +0000 |
| commit | b5972dfa09ffaeb522dd3c24e5eef639424e3d51 (patch) | |
| tree | 40144221805ec7cebb5d45b5cd4629b8fe0ac56e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 431f4a336945298a2cda422d9c3d313f05a31e38 (diff) | |
| parent | 69acf25884747571bfaab267eeaed28c71115359 (diff) | |
[automerger skipped] Merge "Tweak stubs for updatable media" am: 2c99ff0042 am: 2b86731b42 -s ours am: 69acf25884 -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: I30cadc0348b4c4f188e7dfb69811b7de3194abae
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions