diff options
author | Wink Saville <wink@google.com> | 2013-08-08 22:05:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-08 22:05:20 +0000 |
commit | 5191b8599011c255936e3a3cacc052c03e57b772 (patch) | |
tree | 4d8d4b1ba77925c09d1d523e859b318146bfc685 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | cbad1243ad901b8ffcb7497a8f440414b8d41898 (diff) | |
parent | bf34122a96ef3d02e9b7935e07eb4f9b04034828 (diff) |
Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions