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