diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-02-20 18:29:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-20 18:29:44 +0000 |
| commit | b615f565cbbd599f7b39381b27ad55c61443346c (patch) | |
| tree | c627860d3d8774fd9639a29fe478400ec74c1fbe /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | dca779140d506bec4e81d4cedf61e9bf3d8b8a6f (diff) | |
| parent | 8748c9212e9b8159098445b60e0d929d14630568 (diff) | |
Merge "Merge "[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev am: 31a61f6348 -s ours am: f43dd2bd13 -s ours am: ee4cb4f1ee -s ours am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 afc94d724c is in history"
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions