diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-11 12:16:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 12:16:58 +0000 |
| commit | 49e95446fe2b8539c66498a6e2c9a92aad328ab1 (patch) | |
| tree | 4906b4f6a586bb263f4d5f194940a27b09ad7437 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e9a848ea5747dd980c82f266f61ee2a997155ffe (diff) | |
| parent | 2172f58763d8ab007a4cb447dddf1dd542a537ab (diff) | |
Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a am: 2172f58763
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623080
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I075bb9325980052c7f90fb372b61c62e00765d38
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions