diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-25 19:03:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 19:03:34 +0000 |
| commit | 6a7ac540e16cdf6a499580177f4e47a7f39d8554 (patch) | |
| tree | f7e2746b1f912afbfad00d3ce0c39beee4f03407 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9db6e4d7a331f4e219d938074e50b2f9deca45f1 (diff) | |
| parent | a9f628662c348c5926caf5e2df0fd2f245a715bf (diff) | |
am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."
* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
Framework's NetworkSecurityPolicy delegates to libcore's one.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions