diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-18 11:49:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-18 11:49:41 +0000 |
| commit | 954da967533d5a3e432905c655f6c396ee9bf9e3 (patch) | |
| tree | 7c48cbb1d185029e1c2cc3a474df3dbaa4c6e978 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 78dc2edaf0d4f0615387b91578f340706db7ad5f (diff) | |
| parent | 444e91786ad2bdfedc55c1a5c0efed59af382dcc (diff) | |
[automerger skipped] Merge "Pass caller information in cancelBugreport." am: 21d36ec4f5 am: 61b2a3c228 am: 444e91786a -s ours
am skip reason: Change-Id I430d856014a226ef345bd2349f0601062dcaa8c7 with SHA-1 4a1b9e949d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552882
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I43334a1f2633bcc49afddd3d5ab0fd01bd4cfb0e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions