diff options
| author | Varun Anand <vaanand@google.com> | 2019-03-22 12:02:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-22 12:02:13 -0700 |
| commit | 1b8dfb39828e57d8084e90fb8d5d3c5782486ea5 (patch) | |
| tree | e9f148f15a87ad8ad5793ec3a08c8ca368bcffd5 /rs/java/android/renderscript/RenderScript.java | |
| parent | a8056e3fb86d6d8e8e95ea2964bb887b63832588 (diff) | |
| parent | ddaa6338c89cc17388f4f9b86594fa2869bf1101 (diff) | |
[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am: ddaa6338c8 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1 4fa80e8a2f is in history
Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions