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