diff options
| author | Luke Huang <huangluke@google.com> | 2020-06-24 19:56:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 19:56:03 +0000 |
| commit | ccb66a186778a5a48187e766c20aa163331d1eb3 (patch) | |
| tree | 71d7986862cdbc5e7a8a846371c55f59e03966c3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8cf806f538d45a37279aaa6a2aaf71fe94fa7dba (diff) | |
| parent | e6496d48d682a69d1facda455fee493eb41c988a (diff) | |
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: bea02c1460 am: dac98f93a3 -s ours am: ad4d26c9a9 -s ours am: c6fa4855eb -s ours am: e6496d48d6 -s ours
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 6f214e8ebe is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586
Change-Id: Ie5d36cdf3875bab402c66b2c73a87a9c9d83ac11
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions