diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-01 18:26:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-01 18:26:27 +0000 |
| commit | a0dc8eaa8da6c515c80d6afb6e95ecbe9786e4ff (patch) | |
| tree | 63f456b7fb79a95a3f7de69988a4e9016d2b3506 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 28a92bafcfdf89cab55e4a859489d8afdb008c0f (diff) | |
| parent | 70edf54d819053030dda662581ce4295da3b2960 (diff) | |
[automerger skipped] Merge "Deprecated UserManager.getUsers(excludeDying) / added getAliveUsers()" am: c0b44fca8b am: bd2f82c88c am: 70edf54d81 -s ours
am skip reason: Change-Id Ife767a40b7b7790ba28b5377046de822ddbf275c with SHA-1 6dc6d2b964 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406256
Change-Id: I93a7443dabeb35e8ab6e32004730f99e2fc49d69
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions