diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-03-05 05:59:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:59:25 +0000 |
| commit | 65310b11b6da616709317519d3b224b492421a23 (patch) | |
| tree | 0c52b3dbbd74fb6d93c88f2375993bf464541759 /rs/java/android/renderscript/RenderScript.java | |
| parent | 73c020fc4256f4c24839609bd8cbcbfe3e2f6039 (diff) | |
| parent | 8f021be75bda9960a9414233d77551f927341b3c (diff) | |
[automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: 421c5739ea am: da3d7dae0e am: 8f021be75b -s ours
am skip reason: Change-Id I27975113896ea137260a9f94a34fb1c3ca173fe3 with SHA-1 4ba2f0c690 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bd42249b22890ef71ece31e70e7c9a61cdb50e1
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions