diff options
| author | Sterling Huber <hubers@google.com> | 2020-12-03 01:55:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 01:55:04 +0000 |
| commit | 3973bd8080ecd790b83a759daddfb44d016351fa (patch) | |
| tree | 4fba176f9de77180d0a5dcdb237be7fec89ea7ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8f24cb262c80193e9ce7355f4adb7d9a1d8af51e (diff) | |
| parent | 0f09d64ca02cd219a7c397a43e8165ab4e336dae (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: 2ba222af45 am: 0f09d64ca0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13093516
Change-Id: Iae8d96aeaa57477be166cd5ecb0065a1aafd8e7a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions