diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-06 04:22:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-06 04:22:15 +0000 |
| commit | a9a5592c417b76c33223422416c9c53f5aa99370 (patch) | |
| tree | c6e333a508300a3aef1b1fb8194c38d55f3d60a5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 29f8ab4e6ff9736ac5911901b1e4b7ab068e6d5e (diff) | |
| parent | a06910d9ac30a8ab1552685be93a140a3f9bbed2 (diff) | |
Merge "[automerger skipped] [automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618 am: 2ca66d4d10 am: 1c8a632ad2 am: 7eec0a8448 am: 57f6c0deb2 -s ours am: 152bcd6687 -s ours am: 0278ae159c -s ours am skip reason: change_id Iaf80a0ad711762992b8ae60f76d861c97a403013 with SHA1 06041db074 is in history" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions