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