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