diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-03-11 16:56:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 16:56:41 +0000 |
| commit | 2a38d13272cbf1b634f745b9fce47ad8dfdd61ff (patch) | |
| tree | fd6beba004e5e320929a9af1495d47d0c7272267 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67b99e7bee8f8dd75d532fc38f86732e2680284f (diff) | |
| parent | 8b7ca71fd74bd3d24ceaedde4fde10c79c84cbc6 (diff) | |
Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 am: 8b7ca71fd7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41a1d4c746b1bc390a6060f526b90580d3f2397a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions