diff options
| author | Sterling Huber <hubers@google.com> | 2020-12-03 02:20:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 02:20:06 +0000 |
| commit | 2b445ea3aa49a8cb3fab7f2ce79c01dd0e412c4a (patch) | |
| tree | e47fce7e63e19905278c2f96ff16b297f85a3909 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 604f55eab9a257c98aea4e071e24364b94f76684 (diff) | |
| parent | 3973bd8080ecd790b83a759daddfb44d016351fa (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 am: 3973bd8080 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13093516
Change-Id: Id8a6de5997fcbc05639645f4e670206bd269de9a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions