diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 08:43:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 08:43:03 +0000 |
| commit | 891f3708ad7c3f25b4c10a58409093352a79007c (patch) | |
| tree | 832fd29bc7db90f6a06a8c3c82b7d451dae91fc3 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 48e2d6907641abc733b615c7173e4115292ac3e7 (diff) | |
| parent | 4536e07966394610adf9370b79d49d999b651198 (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
Change-Id: I07ad787307e8373f84df7b8c715343f81c7ac1db
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions