diff options
| author | Nataniel Borges <natanieljr@google.com> | 2021-02-19 16:39:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 16:39:39 +0000 |
| commit | aa2b03ecea1df9db1b644d5ee467a55cd7c11496 (patch) | |
| tree | ce0b9f4e4845e09f792d8c7846cfad794453eebc /rs/java/android/renderscript/ProgramStore.java | |
| parent | adf1883ceed822e8c2c0792ddc59c0dc2b8314ac (diff) | |
| parent | d88a8d2036600b5516ba1baa45a760e4cb74264f (diff) | |
Merge "Revert "Delete VPN methods in ConnectivityManager."" am: 7096deadf4 am: d88a8d2036
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ice973f502bb389d1ff400bbcd206987d48ff07dd
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions