diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-24 00:22:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 00:22:14 +0000 |
| commit | 4c0d5634ec4c5f607c5568e53a91c4bd2e3de471 (patch) | |
| tree | ac88981ec20155c358ef7cf347686ca88dfc5151 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a1bbbe54b78437aa84fd8d3009f1731fb2de42a7 (diff) | |
| parent | 2087d30844b7d69ed1f9b350286cc1fdeea869a6 (diff) | |
Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62 am: ace6cea9b0 am: 2087d30844
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e1dd5224970f6ac4379cfa86584ca2afaf0b6c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions