diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 10:09:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 10:09:53 +0000 |
| commit | 1a1a75846c9b98c12aebd035355cd14c7f185e4d (patch) | |
| tree | d2ae5ca54220b9fb4ff34cbc8efb6a4f802aad71 /rs/java/android/renderscript/ProgramVertex.java | |
| parent | abaa80bc870f522d59d33822567c477c793f9d17 (diff) | |
| parent | 7ea32155cf2f03cf490e42e715129034e926b62b (diff) | |
[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3 am: 9d5989df0b am: ab6b640548 -s ours am skip reason: subject contains skip directive am: 1300362067 -s ours am skip reason: subject contains skip directive am: 3b8b2681aa -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 4536e07966 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 891f3708ad -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 7ea32155cf -s ours
am skip reason: subject contains skip directive
Change-Id: I43d7db3232ed683f41f72b97f849ddde07ce31e3
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertex.java')
0 files changed, 0 insertions, 0 deletions