diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-24 22:19:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-24 22:19:42 +0000 |
| commit | ccef3d8305e1483021224bf791d37e7c759fe5ba (patch) | |
| tree | 5bb9316d76b00d37104ea24af3804f5f900ce303 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1d191d325154b47841d50a600b94258b2e05774a (diff) | |
| parent | c5792c3904765310842e0d870ae40490ba210870 (diff) | |
Merge "Keystore 2.0: Remove attestKey from KeyChain." am: eb45aabc03 am: c5792c3904
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559810
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6a096ec2f220c60b27b1e26f81817b00ae6af35
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions