diff options
| author | Hall Liu <hallliu@google.com> | 2020-07-23 21:15:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 21:15:22 +0000 |
| commit | c928ebcb4b6d54eccc7165507d8a65e684065852 (patch) | |
| tree | 31571ad83547e3fdbf889c36ace7d13bafe6c0cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e78ac20b5da5f044dc1f731d9102aa42fa3e436a (diff) | |
| parent | 0f91b64c34543d21657ddd149e6a7caa71761456 (diff) | |
[automerger skipped] Merge "Skip carrier priv check for trusted UIDs" am: df9bf16543 am: cbf30830bc -s ours am: 01f398db16 -s ours am: 8ecdd6b7b2 -s ours am: 0f91b64c34 -s ours
am skip reason: Change-Id I1399cab579308479d7cf191b8795441cbcd3ff65 with SHA-1 12a3f5cfdc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371497
Change-Id: If2e245e51cb5762672aa7010c4307a37b2b084f3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions