diff options
| author | Shuo Qian <shuoq@google.com> | 2020-11-10 18:05:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 18:05:33 +0000 |
| commit | 36b8f60f2d787b3dccf0dca793d2e13bb89287b0 (patch) | |
| tree | 29e15111ae46e9ff8b52bd68d46b5fa337a08821 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85f67a9c8fe865b1dd6439cb16ebc4d5d2c7d1e5 (diff) | |
| parent | 9a0675c3dd9bdf80eeeae466efde353dc91ea2d4 (diff) | |
[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e05985 am: 84838b0a56 am: b570ddfa05 -s ours am: 9a0675c3dd -s ours
am skip reason: Change-Id Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49 with SHA-1 6147275aa7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484359
Change-Id: Ib902b31bb20829fe9e79ec7479c9e0ad59294e2a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions