diff options
| author | Jiyong Park <jiyong@google.com> | 2019-04-17 07:56:32 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 07:56:32 -0700 |
| commit | 1197d0265d03f7126c2e3a478f2b14d10fd18a89 (patch) | |
| tree | 20042d40ca6b1f339f1a8caf24bba29b1e21e063 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9aaff3accf2a5c29f8ac550564246a93d2f980bf (diff) | |
| parent | 20413a0609a3c70f53fa7c5a1622ae7ba0f094fb (diff) | |
Merge "[automerger skipped] Merge "Remove getDefaultTransactionName and getTransactionName from API" am: 8c74e1a7c0 am: 374db029ee -s ours
am: 20413a0609 -s ours
am skip reason: change_id I66d6ba57f0b922335b972e718879c1d7e9b64d79 with SHA1 c5705a82b6 is in history
Change-Id: I32810782d78bf1a871ff68f242c4cf4b37a15cb0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions