diff options
| author | Sterling Huber <hubers@google.com> | 2020-12-03 01:21:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 01:21:59 +0000 |
| commit | 52951f69cfcd0de2f15ac6b984375fbbef50b8f6 (patch) | |
| tree | 172ffe6cbcb555986c692dfd52d3e9a58068b624 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e4629a44ee6641333bb62103fcdea60fd333849 (diff) | |
| parent | 68a96d3333548ad8ea9ed1973eb8591ba94fa054 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure caller identity is restored in CP quick-path." into qt-dev am: 76a6546f5a am: 5a39301cd4 -s ours am: d8c86983d8 am: 68a96d3333 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13093516
Change-Id: I45cbea7c8f9ff878b592af53b0f506d7c0db7d42
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions