diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 22:52:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 22:52:37 +0000 |
| commit | 5654d906e74ce45f130018ca14f444afda127af4 (patch) | |
| tree | f4e4223780d4bc9aba4340be1370e59c0d1a367f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4ada895b7be598f819815fda5b3f826a7943549 (diff) | |
| parent | 21a34411616a968150ea2dc0ab09ecc8810b94ab (diff) | |
Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours am: bdda889b15 -s ours am: 92ffd8ab34 -s ours" into rvc-qpr-dev-plus-aosp am: 21a3441161 -s ours
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 b059bd3947 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11003608
Change-Id: Id20e694fb69e1bc66036e1c2d5d7aa9b19c0f1c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions