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