diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 06:43:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-10 06:43:56 +0000 |
| commit | b935f861aba0767e684e109bca67bd8ca2f4697e (patch) | |
| tree | dc63c101cad2c70f0201efce452a515dfdfd095b /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 219a746026b4f15baadfab11523c0bbe804a1ac4 (diff) | |
| parent | 61c7ade3a8d3ebad20237beb6f0986d872c086dd (diff) | |
[automerger skipped] Merge "Add keepalive related methods and fields to system APIs" am: b7d665988d am: 23a2ee7ac2 am: 61c7ade3a8 -s ours
am skip reason: Change-Id I2d982e8abb5cb6b4c74a20483550b18cf814320d with SHA-1 17c660dfeb is in history
Change-Id: Iac4c0a4c7d56693fe3505336c007565ac3ce76f8
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions