diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-16 15:31:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-16 15:31:32 +0000 |
| commit | 12e2065d8cbf7bc0084804595749540470911608 (patch) | |
| tree | 898bca7826e824c241a78baa6ae629032012f882 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8937dc04c823a9b2251983e0b7022c89e6c32a58 (diff) | |
| parent | 435cf631bd27f5fd7abc27d685b4b8eb8406dd58 (diff) | |
[automerger skipped] Merge "Handle ParcelableException instead of crashing system server" am: 592266cbf1 am: 48a435ea89 am: 435cf631bd -s ours
am skip reason: Change-Id Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5 with SHA-1 8ce32fe577 is in history
Change-Id: Iaacc2809364d73bb4752e1484f0f65fc5b466129
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions