diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 05:44:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 05:44:42 +0000 |
| commit | fa0a6619a702aeb8b1136c26df68b569063ae5ea (patch) | |
| tree | b768e8d794443995419fcbe9f854cd5e9f383f93 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 324f2845f5a5bea15c32dade2114de5e090f5e65 (diff) | |
| parent | 8920ca6b0e401108ca01840af8ef5a9959351d35 (diff) | |
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am: da2466a36d -s ours am skip reason: subject contains skip directive am: 4c19a822ac -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: f81579f0b9 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: ffa766c971 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 8920ca6b0e -s ours
am skip reason: subject contains skip directive
Change-Id: Ib56d0a3440d758e2b98822390e23aff33b41fa11
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions