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