diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-03-05 05:41:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:41:50 +0000 |
| commit | 8f021be75bda9960a9414233d77551f927341b3c (patch) | |
| tree | e29427adde70d7741199d63ff2b023095618ead1 /rs/java/android/renderscript/RenderScript.java | |
| parent | 84047d72cf4c2d0e895455e6e2e449c82e7b5ef3 (diff) | |
| parent | da3d7dae0ee7cd8645ad13344e63210e9a03c940 (diff) | |
Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: 421c5739ea am: da3d7dae0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77346383545bd79d9406b5711f969e07eb1e66f0
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions