diff options
| author | Jordan Liu <jminjie@google.com> | 2019-07-12 11:58:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-12 11:58:14 -0700 |
| commit | 616c4cc77e128a7bbe30320af523c3a713b84ca0 (patch) | |
| tree | 8f6b45582a66a2b48c6947ad504d8d41899d857e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d61e4e9453cc9195f05eb4af5d2d3ce01e2f1bf9 (diff) | |
| parent | 3953c473a1e22ea765ee58f564673c7b92082c4a (diff) | |
[automerger skipped] Merge "Use TM SubId in getDataState and getDataActivity" into qt-r1-dev am: 7dad5ea750 -s ours
am: 3953c473a1 -s ours
am skip reason: change_id I035f2c44a7955e88608b1c336acb72fb68c3e450 with SHA1 af984d0d4e is in history
Change-Id: If9bd299eddf63de1fddc657739566a8a9ded5e96
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions