diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:05:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 07:05:11 +0000 |
| commit | a2fac8d14650eade24228cd66c7f55db4969e037 (patch) | |
| tree | 45c5f68a09e1bb679be64cf6104e8953765611a8 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 5f6aa76ca2b0ea1375bec8fcb4c07a539a5c82fc (diff) | |
| parent | 496ee0209600a581cf7fd67a0d2c8e79ba5897a1 (diff) | |
Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e am: 926a2a40cf -s ours" into rvc-qpr-dev-plus-aosp am: 496ee02096 -s ours
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669
Change-Id: I4df4adf27b866a4111ab6c4d8a63903dd26c39c9
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions