diff options
| author | Wink Saville <wink@google.com> | 2013-08-08 15:43:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 15:43:07 -0700 |
| commit | b9b4321b756ac6e44650031ebfe0134508f60eaa (patch) | |
| tree | 99309e88ec971dfa523ff5b2fbd6f33f553cd89e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9b6363e5e6d37e3e8d103751d81613eeca32bbbf (diff) | |
| parent | 5191b8599011c255936e3a3cacc052c03e57b772 (diff) | |
am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probably a captive portal." into jb-mr2-dev
* commit '5191b8599011c255936e3a3cacc052c03e57b772':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions