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